suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to Coin3d 4.x

Browse Source
This commit is contained in:
wmayer 2013-05-30 17:03:52 +02:00
parent 26d1751aeb
commit ab012f5bee
1 changed files with 107 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/SoTextLabel.cpp
View File

@ -45,6 +45,7 @@
# include <Inventor/misc/SoState.h> # include <Inventor/misc/SoState.h>
#endif #endif
#include <Inventor/C/basic.h>
#include <Inventor/draggers/SoTranslate2Dragger.h> #include <Inventor/draggers/SoTranslate2Dragger.h>
#include <Inventor/elements/SoFontNameElement.h> #include <Inventor/elements/SoFontNameElement.h>
#include <Inventor/elements/SoFontSizeElement.h> #include <Inventor/elements/SoFontSizeElement.h>
@ -55,7 +56,11 @@
#include <Inventor/elements/SoViewVolumeElement.h> #include <Inventor/elements/SoViewVolumeElement.h>
#include <Inventor/elements/SoViewportRegionElement.h> #include <Inventor/elements/SoViewportRegionElement.h>
#include <Inventor/elements/SoGLTextureEnabledElement.h> #include <Inventor/elements/SoGLTextureEnabledElement.h>
#if COIN_MAJOR_VERSION > 3
#include <Inventor/elements/SoMultiTextureEnabledElement.h>
#else
#include <Inventor/elements/SoGLTexture3EnabledElement.h> #include <Inventor/elements/SoGLTexture3EnabledElement.h>
#endif
#include "SoTextLabel.h" #include "SoTextLabel.h"
#include "SoFCInteractiveElement.h" #include "SoFCInteractiveElement.h"
@ -250,7 +255,11 @@ void SoTextLabel::GLRender(SoGLRenderAction *action)
// disable textures for all units // disable textures for all units
SoGLTextureEnabledElement::set(state, this, FALSE); SoGLTextureEnabledElement::set(state, this, FALSE);
#if COIN_MAJOR_VERSION > 3
SoMultiTextureEnabledElement::set(state, this, FALSE);
#else
SoGLTexture3EnabledElement::set(state, this, FALSE); SoGLTexture3EnabledElement::set(state, this, FALSE);
#endif
glPushAttrib(GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT); glPushAttrib(GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);