Merge remote-tracking branch 'origin/Animations' into Weapons

2016-03-04 03:04:36 +01:00
parent 03ea9bcf40 1bd71931b8
commit 609f6619a6
1 changed files with 4 additions and 1 deletions
@@ -219,7 +219,6 @@ BlendTree::AutoBlendInfo BlendTree::AutoBlendStep(AutoBlendInfo blendInfo)
        }
    }

-
    if(goalNodes.size() == 0) {
        return blendInfo;
    } else if(goalNodes.size() == 1) {
@@ -383,6 +382,10 @@ EntityWrapper BlendTree::GetSubTreeRoot(std::string nodeName)
 {
    std::vector<Node*> nodes = FindNodesByName(nodeName);

+    if (nodes.size() == 0) {
+        return EntityWrapper::Invalid;
+    }
+
    std::vector<Node*> subTreeRoots;

    for (auto it = nodes.begin(); it != nodes.end(); it++) {