[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44226] trunk/blender/source/blender/ collada/TransformWriter.cpp: Minor change collada export; don' t even run the parentinv-test when ob->parent is NULL
Juha Mäki-Kanto
kiskosika at gmail.com
Sat Feb 18 16:41:18 CET 2012
Revision: 44226
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44226
Author: kanttori
Date: 2012-02-18 15:41:09 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Minor change collada export; don't even run the parentinv-test when ob->parent is NULL
Modified Paths:
--------------
trunk/blender/source/blender/collada/TransformWriter.cpp
Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp 2012-02-18 15:25:31 UTC (rev 44225)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp 2012-02-18 15:41:09 UTC (rev 44226)
@@ -95,20 +95,24 @@
*/
/* Using parentinv should allow use of existing curves */
- // If parentinv is identity don't add it.
- bool add_parinv = false;
- for(int i = 0; i < 16; ++i)
+ if(ob->parent)
{
- float f = (i%4 == i/4) ? 1.0f : 0.0f ;
- if(ob->parentinv[i%4][i/4] != f) add_parinv = true;
- }
+ // If parentinv is identity don't add it.
+ bool add_parinv = false;
- if(add_parinv && ob->parent)
- {
- double dmat[4][4];
- UnitConverter converter;
- converter.mat4_to_dae_double(dmat, ob->parentinv);
- node.addMatrix("parentinverse", dmat);
+ for(int i = 0; i < 16; ++i)
+ {
+ float f = (i%4 == i/4) ? 1.0f : 0.0f ;
+ add_parinv |= (ob->parentinv[i%4][i/4] != f);
+ }
+
+ if(add_parinv)
+ {
+ double dmat[4][4];
+ UnitConverter converter;
+ converter.mat4_to_dae_double(dmat, ob->parentinv);
+ node.addMatrix("parentinverse", dmat);
+ }
}
add_transform(node, ob->loc, ob->rot, ob->size);
More information about the Bf-blender-cvs
mailing list