[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28585] trunk/blender/source/blender: BGE Logic UI: fix for scene actuator

[Dalai Felinto]

Revision: 28585
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28585
Author:   dfelinto
Date:     2010-05-05 00:05:41 +0200 (Wed, 05 May 2010)

Log Message:
-----------
BGE Logic UI: fix for scene actuator

Any volunteer for this?
//XXX to do: an operator that calls file_browse with relative_path on and blender filtering active

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-04 22:02:26 UTC (rev 28584)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-04 22:05:41 UTC (rev 28585)
@@ -3720,8 +3720,17 @@
 static void draw_actuator_scene(uiLayout *layout, PointerRNA *ptr)
 {
 	uiItemR(layout, ptr, "mode", 0, NULL, 0);
-	uiItemR(layout, ptr, "camera", 0, NULL, 0);
-	uiItemR(layout, ptr, "scene", 0, NULL, 0);
+
+	switch (RNA_enum_get(ptr, "mode")) {
+		case ACT_SCENE_CAMERA:
+			uiItemR(layout, ptr, "camera", 0, NULL, 0);
+			break;
+		case ACT_SCENE_RESTART:
+			break;
+		default: // ACT_SCENE_SET|ACT_SCENE_ADD_FRONT|ACT_SCENE_ADD_BACK|ACT_SCENE_REMOVE|ACT_SCENE_SUSPEND|ACT_SCENE_RESUME
+			uiItemR(layout, ptr, "scene", 0, NULL, 0);
+			break;
+	}
 }
 
 static void draw_actuator_shape_action(uiLayout *layout, PointerRNA *ptr)

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-05-04 22:02:26 UTC (rev 28584)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-05-04 22:05:41 UTC (rev 28585)
@@ -730,7 +730,7 @@
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 	
 	prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
-	RNA_def_property_struct_type(prop, "Object");
+	RNA_def_property_struct_type(prop, "Camera");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Camera Object", "Set this Camera. Leave empty to refer to self object");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
@@ -741,7 +741,7 @@
 	RNA_def_property_ui_text(prop, "Scene", "Set the Scene to be added/removed/paused/resumed");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 
-	/* XXX
+	/* XXX no need for those tooltips. to remove soon
 	Originally we had different 'scene' tooltips for different values of 'type'.
 	They were:
 	ACT_SCENE_RESTART	""
@@ -954,9 +954,10 @@
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 
 	/* ACT_GAME_LOAD */
-	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_DIRPATH);
+	prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_ui_text(prop, "File", "Load this blend file, use the \"//\" prefix for a path relative to the current blend file");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
+	//XXX to do: an operator that calls file_browse with relative_path on and blender filtering active
 }
 
 static void rna_def_visibility_actuator(BlenderRNA *brna)