BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash when trying to blend to a nonexistent node

Browse Source
This commit is contained in:
viktorljung
2016-03-04 02:53:23 +01:00
parent 1ff91a5c5d
commit 1bd71931b8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/BlendTree.cpp
+4 -1
View File
@@ -219,7 +219,6 @@ BlendTree::AutoBlendInfo BlendTree::AutoBlendStep(AutoBlendInfo blendInfo)
} }
} }
if(goalNodes.size() == 0) { if(goalNodes.size() == 0) {
return blendInfo; return blendInfo;
} else if(goalNodes.size() == 1) { } else if(goalNodes.size() == 1) {
@@ -383,6 +382,10 @@ EntityWrapper BlendTree::GetSubTreeRoot(std::string nodeName)
{ {
std::vector<Node*> nodes = FindNodesByName(nodeName); std::vector<Node*> nodes = FindNodesByName(nodeName);
if (nodes.size() == 0) {
return EntityWrapper::Invalid;
}
std::vector<Node*> subTreeRoots; std::vector<Node*> subTreeRoots;
for (auto it = nodes.begin(); it != nodes.end(); it++) { for (auto it = nodes.begin(); it != nodes.end(); it++) {