FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/modelopt' into next

Browse Source
This commit is contained in:
Tim Moore
2009-01-23 23:27:48 +01:00
parent 26a416399f be0635bfd3
commit 781c445d14
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
simgear/scene/model/ModelRegistry.cxx
View File

@@ -494,13 +494,14 @@ struct ACOptimizePolicy : public OptimizeModelPolicy {
{
ref_ptr<Node> optimized
= OptimizeModelPolicy::optimize(node, fileName, opt);
Group* group = dynamic_cast<Group*>(optimized.get());
MatrixTransform* transform
= dynamic_cast<MatrixTransform*>(optimized.get());
if (transform && transform->getMatrix().isIdentity()
&& transform->getName().empty()
&& transform->getNumChildren() == 1) {
optimized = static_cast<Node*>(transform->getChild(0));
Group* group = dynamic_cast<Group*>(optimized.get());
if (((transform && transform->getMatrix().isIdentity()) || group)
&& group->getName().empty()
&& group->getNumChildren() == 1) {
optimized = static_cast<Node*>(group->getChild(0));
group = dynamic_cast<Group*>(optimized.get());
if (group && group->getName().empty()
&& group->getNumChildren() == 1)
optimized = static_cast<Node*>(group->getChild(0));