Ignore parent matrix setting in getConcatenatedMatrix

ivansafrin · ivansafrin · commit 38d063aefadb · 2014-05-06T01:58:34.000-04:00
diff --git a/Core/Contents/Source/PolyEntity.cpp b/Core/Contents/Source/PolyEntity.cpp
@@ -729,7 +729,7 @@ Matrix4 Entity::getConcatenatedMatrix() {
 		rebuildTransformMatrix();
     }
     
-	if(parentEntity != NULL) 
+	if(parentEntity != NULL && !ignoreParentMatrix) 
 		return transformMatrix * parentEntity->getConcatenatedMatrix();
 	else
 		return transformMatrix;

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ Matrix4 Entity::getConcatenatedMatrix() {`
`729`	`729`	`rebuildTransformMatrix();`
`730`	`730`	`}`
`731`	`731`
`732`		`- if(parentEntity != NULL)`
	`732`	`+ if(parentEntity != NULL && !ignoreParentMatrix)`
`733`	`733`	`return transformMatrix * parentEntity->getConcatenatedMatrix();`
`734`	`734`	`else`
`735`	`735`	`return transformMatrix;`