[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29056] trunk/blender/source/blender/ editors/space_logic/logic_window.c: Fix Open Sound operator, bring it in line with Open Image:

Matt Ebb matt at mke3.net
Sat May 29 01:12:46 CEST 2010


Revision: 29056
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29056
Author:   broken
Date:     2010-05-29 01:12:45 +0200 (Sat, 29 May 2010)

Log Message:
-----------
Fix Open Sound operator, bring it in line with Open Image:
* Add relative paths option
* Set the pointer used in the ID template properly

* Tweaked the Sound actuator ui

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

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-28 21:25:23 UTC (rev 29055)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-28 23:12:45 UTC (rev 29056)
@@ -4202,7 +4202,7 @@
 
 static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr, bContext *C)
 {
-	uiLayout *row, *box;
+	uiLayout *row, *col;
 
 	uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL);
 	if (!RNA_pointer_get(ptr, "sound").data)
@@ -4216,23 +4216,24 @@
 	uiItemR(row, ptr, "volume", 0, NULL, 0);
 	uiItemR(row, ptr, "pitch", 0, NULL, 0);
 
-	uiItemR(layout, ptr, "enable_sound_3d", UI_ITEM_R_TOGGLE, NULL, 0);
-	box = uiLayoutBox(layout);
-	uiLayoutSetActive(box, RNA_boolean_get(ptr, "enable_sound_3d")==1);
+	uiItemR(layout, ptr, "enable_sound_3d", 0, NULL, 0);
+	
+	col = uiLayoutColumn(layout, 0);
+	uiLayoutSetActive(col, RNA_boolean_get(ptr, "enable_sound_3d")==1);
 
-	row = uiLayoutRow(box, 0);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "minimum_gain_3d", 0, NULL, 0);
 	uiItemR(row, ptr, "maximum_gain_3d", 0, NULL, 0);
 
-	row = uiLayoutRow(box, 0);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "reference_distance_3d", 0, NULL, 0);
 	uiItemR(row, ptr, "max_distance_3d", 0, NULL, 0);
 
-	row = uiLayoutRow(box, 0);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, 0);
 	uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, 0);
 
-	row = uiLayoutRow(box, 0);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, 0);
 	uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, 0);
 }





More information about the Bf-blender-cvs mailing list