[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18341] branches/blender2.5/blender/source /gameengine/Converter: Yeah, and then the game engine too!

[Ton Roosendaal]

Revision: 18341
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18341
Author:   ton
Date:     2009-01-05 16:48:24 +0100 (Mon, 05 Jan 2009)

Log Message:
-----------
Yeah, and then the game engine too!

Modified Paths:
--------------
    branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Modified: branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-01-05 15:35:49 UTC (rev 18340)
+++ branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-01-05 15:48:24 UTC (rev 18341)
@@ -58,7 +58,7 @@
 	m_activePriority(999),
 	m_lastapplyframe(0.0)
 {
-	m_armature = get_armature(m_objArma);
+	m_armature = (bArmature *)armature->data;
 
 	/* we make a copy of blender object's pose, and then always swap it with
 	 * the original pose before calling into blender functions, to deal with

Modified: branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2009-01-05 15:35:49 UTC (rev 18340)
+++ branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2009-01-05 15:48:24 UTC (rev 18341)
@@ -2353,7 +2353,7 @@
 			case PARBONE:
 			{
 				// parent this to a bone
-				Bone *parent_bone = get_named_bone(get_armature(blenderchild->parent), blenderchild->parsubstr);
+				Bone *parent_bone = get_named_bone( (bArmature *)(blenderchild->parent)->data, blenderchild->parsubstr);
 
 				if(parent_bone) {
 					KX_BoneParentRelation *bone_parent_relation = KX_BoneParentRelation::New(parent_bone);