From 1bd71931b8452dd01f1768b38f44c9503e2028dc Mon Sep 17 00:00:00 2001 From: viktorljung Date: Fri, 4 Mar 2016 02:53:23 +0100 Subject: [PATCH] Fixed crash when trying to blend to a nonexistent node --- src/Engine/Rendering/BlendTree.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Engine/Rendering/BlendTree.cpp b/src/Engine/Rendering/BlendTree.cpp index 60858f2a..9b6679ea 100644 --- a/src/Engine/Rendering/BlendTree.cpp +++ b/src/Engine/Rendering/BlendTree.cpp @@ -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 nodes = FindNodesByName(nodeName); + if (nodes.size() == 0) { + return EntityWrapper::Invalid; + } + std::vector subTreeRoots; for (auto it = nodes.begin(); it != nodes.end(); it++) {