[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29386] branches/render25/source: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r29381:29385

[Campbell Barton]

Revision: 29386
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29386
Author:   campbellbarton
Date:     2010-06-10 18:00:24 +0200 (Thu, 10 Jun 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29381:29385

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/sequencer.c
    branches/render25/source/blender/makesrna/intern/rna_sequencer.c
    branches/render25/source/blender/makesrna/intern/rna_sound.c
    branches/render25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c	2010-06-10 15:41:01 UTC (rev 29385)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c	2010-06-10 16:00:24 UTC (rev 29386)
@@ -566,7 +566,7 @@
 	}
 }
 
-/* note: caller should run calc_sequence(scene, seq) */
+/* note: caller should run calc_sequence(scene, seq) after */
 void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range)
 {
 	char str[FILE_MAXDIR+FILE_MAXFILE];

Modified: branches/render25/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_sequencer.c	2010-06-10 15:41:01 UTC (rev 29385)
+++ branches/render25/source/blender/makesrna/intern/rna_sequencer.c	2010-06-10 16:00:24 UTC (rev 29386)
@@ -348,11 +348,22 @@
 	return rna_pointer_inherit_refine(&iter->parent, &RNA_Sequence, ms->parseq);
 }
 
+/* TODO, expose seq path setting as a higher level sequencer BKE function */
 static void rna_Sequence_filepath_set(PointerRNA *ptr, const char *value)
 {
 	Sequence *seq= (Sequence*)(ptr->data);
 	char dir[FILE_MAX], name[FILE_MAX];
 
+	if(seq->type == SEQ_SOUND && seq->sound) {
+		/* for sound strips we need to update the sound as well.
+		 * arguably, this could load in a new sound rather then modify an existing one.
+		 * but while using the sequencer its most likely your not using the sound in the game engine too.
+		 */
+		PointerRNA id_ptr;
+		RNA_id_pointer_create((ID *)seq->sound, &id_ptr);
+		RNA_string_set(&id_ptr, "filepath", value);
+	}
+
 	BLI_split_dirfile(value, dir, name);
 	BLI_strncpy(seq->strip->dir, dir, sizeof(seq->strip->dir));
 	BLI_strncpy(seq->strip->stripdata->name, name, sizeof(seq->strip->stripdata->name));

Modified: branches/render25/source/blender/makesrna/intern/rna_sound.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_sound.c	2010-06-10 15:41:01 UTC (rev 29385)
+++ branches/render25/source/blender/makesrna/intern/rna_sound.c	2010-06-10 16:00:24 UTC (rev 29386)
@@ -72,7 +72,7 @@
 
 	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
-	RNA_def_property_ui_text(prop, "Filename", "Sound sample file used by this Sound datablock");
+	RNA_def_property_ui_text(prop, "File Path", "Sound sample file used by this Sound datablock");
 	RNA_def_property_update(prop, 0, "rna_Sound_filepath_update");
 
 	prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE);

Modified: branches/render25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- branches/render25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-06-10 15:41:01 UTC (rev 29385)
+++ branches/render25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2010-06-10 16:00:24 UTC (rev 29386)
@@ -752,22 +752,21 @@
 	{
 		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();