FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Julien Valentin
2017-09-01 15:12:10 +02:00
parent dee9dc2164
commit 8b74b04de0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgAnimation/MorphTransformHardware.cpp
View File

@@ -48,7 +48,8 @@ bool MorphTransformHardware::init(MorphGeometry& morphGeometry)
///check for correct morph configuration
///(blender osgexport doesn't set sources so assume morphgeom arrays are sources)
if(pos)
{ pos->setDataVariance(osg::Object::STATIC);
{
pos->setDataVariance(osg::Object::STATIC);
///check if source is setted correctly
if (!vertexSource|| vertexSource->size() != pos->size())
{

3
src/osgAnimation/RigTransformHardware.cpp
View File

@@ -346,8 +346,7 @@ bool RigTransformHardware::init(RigGeometry& rig)
stateset->removeUniform("matrixPalette");
stateset->addUniform(_uniformMatrixPalette);
stateset->removeAttribute(osg::StateAttribute::PROGRAM);
stateset->setAttributeAndModes(program.get());
stateset->setAttribute(program.get());
_needInit = false;
return true;