Browse Source

Fix for not being able to select animated models

Josh Engebretson 10 years ago
parent
commit
53d5443680

+ 2 - 2
Source/Atomic/Atomic3D/AnimatedModel.cpp

@@ -138,7 +138,7 @@ void AnimatedModel::ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQu
 {
     // If no bones or no bone-level testing, use the StaticModel test
     RayQueryLevel level = query.level_;
-    if (level < RAY_TRIANGLE || !skeleton_.GetNumBones())
+    if (level < RAY_TRIANGLE || !skeleton_.GetNumBones() || !boneCreationEnabled_)
     {
         StaticModel::ProcessRayQuery(query, results);
         return;
@@ -909,7 +909,7 @@ void AnimatedModel::AssignBoneNodes()
 {
     assignBonesPending_ = false;
 
-    if (!node_)
+    if (!node_ || !boneCreationEnabled_)
         return;
 
     // Find the bone nodes from the node hierarchy and add listeners

+ 0 - 1
Source/AtomicEditorWork/Editors/SceneEditor3D/SceneView3D.cpp

@@ -333,7 +333,6 @@ void SceneView3D::HandlePostRenderUpdate(StringHash eventType, VariantMap& event
                 debugRenderer_->AddNode(r.drawable_->GetNode(), 1.0, false);
                 r.drawable_->DrawDebugGeometry(debugRenderer_, false);
             }
-
         }
     }
     else