COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook

1 files changed, 6 insertions, 6 deletions

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 3a5bb92b4fa..b4ddc4f9e54 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -100,6 +100,7 @@ extern "C"
 extern "C" {
 	#include "BKE_context.h"
 	#include "BLO_readfile.h"
+	#include "BKE_idcode.h"
 	#include "BKE_report.h"
 	#include "DNA_space_types.h"
 	#include "DNA_windowmanager_types.h" /* report api */
@@ -752,22 +753,21 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 	{
 		KX_Scene* scene = scenes->at(i);
 		//PHY_IPhysicsEnvironment* physEnv = scene->GetPhysicsEnvironment();
-		CListValue* parentList = scene->GetRootParentList();
+		CListValue* parentList = scene->GetObjectList();
 		int numObjects = parentList->GetCount();
 		int g;
 		for (g=0;g<numObjects;g++)
 		{
 			KX_GameObject* gameObj = (KX_GameObject*)parentList->GetValue(g);
-			if (gameObj->IsDynamic())
+			Object* blenderObject = gameObj->GetBlenderObject();
+			if (blenderObject && blenderObject->parent==NULL && gameObj->GetPhysicsController() != NULL)
 			{
 				//KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
-				
-				Object* blenderObject = gameObj->GetBlenderObject();
 
 				if(blenderObject->adt==NULL)
 					BKE_id_add_animdata(&blenderObject->id);
 
-				if (blenderObject && blenderObject->adt)
+				if (blenderObject->adt)
 				{
 					const MT_Point3& position = gameObj->NodeGetWorldPosition();
 					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
@@ -939,7 +939,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
 	Main *main_tmp= NULL; /* created only for linking, then freed */
 	LinkNode *names = NULL;
 	BlendHandle *bpy_openlib = NULL;	/* ptr to the open .blend file */	
-	int idcode= BLO_idcode_from_name(group);
+	int idcode= BKE_idcode_from_name(group);
 	short flag= 0; /* dont need any special options */
 	ReportList reports;
 	static char err_local[255];