Showing the changes to libraries/render-utils/src/Model.cpp (1 of 4 files). Show all
Unified · Split
| @@ -426,12 +426,12 @@ bool Model::updateGeometry() { · 425 unmodified lines | |||
| 426 | _dilatedTextures.clear(); | 426 | _dilatedTextures.clear(); |
| 427 | _geometry = geometry; | 427 | _geometry = geometry; |
| 428 | _meshGroupsKnown = false; | 428 | _meshGroupsKnown = false; |
| 429 | setJointStates(newJointStates); | 429 | initJointStates(newJointStates); |
| 430 | needToRebuild = true; | 430 | needToRebuild = true; |
| 431 | } else if (_jointStates.isEmpty()) { | 431 | } else if (_jointStates.isEmpty()) { |
| 432 | const FBXGeometry& fbxGeometry = geometry->getFBXGeometry(); | 432 | const FBXGeometry& fbxGeometry = geometry->getFBXGeometry(); |
| 433 | if (fbxGeometry.joints.size() > 0) { | 433 | if (fbxGeometry.joints.size() > 0) { |
| 434 | setJointStates(createJointStates(fbxGeometry)); | 434 | initJointStates(createJointStates(fbxGeometry)); |
| 435 | needToRebuild = true; | 435 | needToRebuild = true; |
| 436 | } | 436 | } |
| 437 | } else if (!geometry->isLoaded()) { | 437 | } else if (!geometry->isLoaded()) { |
| @@ -469,7 +469,7 @@ bool Model::updateGeometry() { · 31 unmodified lines | |||
| 469 | } | 469 | } |
| 470 | 470 | ||
| 471 | // virtual | 471 | // virtual |
| 472 | void Model::setJointStates(QVector<JointState> states) { | 472 | void Model::initJointStates(QVector<JointState> states) { |
| 473 | _jointStates = states; | 473 | _jointStates = states; |
| 474 | initJointTransforms(); | 474 | initJointTransforms(); |
| 475 | 475 | ||