Changeset 13111

Show
Ignore:
Timestamp:
11/21/14 21:16:16 (28 hours ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r13097 r13111  
    786786                            { 
    787787                                osg::Camera* camera = *citr; 
    788                                 if (camera->getView() && 
     788                                if ((camera->getNodeMask()!=0) && 
     789                                    camera->getView() && 
    789790                                    camera->getAllowEventFocus() && 
    790791                                    camera->getRenderTargetImplementation()==osg::Camera::FRAME_BUFFER)