TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

aggresive flattening of certain nodes

Browse Source
This commit is contained in:
Zachary Pavlov 2009-10-13 18:19:18 +00:00
parent ae0ced7c2c
commit c0f1124dfe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/pgraph/sceneGraphReducer.cxx
View File

@ -773,7 +773,11 @@ do_flatten_siblings(PandaNode *parent_node, PandaNode *child1,
////////////////////////////////////////////////////////////////////
PT(PandaNode) SceneGraphReducer::
collapse_nodes(PandaNode *node1, PandaNode *node2, bool siblings) {
return node2->combine_with(node1);
PT(PandaNode) result = node2->combine_with(node1);
if (result == NULL) {
result = node1->combine_with(node2);
}
return result;
}