[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35758] trunk/blender/source/blender/ editors/space_logic/logic_window.c: Logic Editor UI: sensor frequency active only when one of the triggers is on.

Dalai Felinto dfelinto at gmail.com
Thu Mar 24 22:07:54 CET 2011


Revision: 35758
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35758
Author:   dfelinto
Date:     2011-03-24 21:07:54 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Logic Editor UI: sensor frequency active only when one of the triggers is on. Removing text "Action" from Action and Shape Action Actuators.
I still would love to see a change in the action actuators (Action, Shape and FCurve) even if only a rename or unifying them in a single actuator (I do have some patch for that). Anyways

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	2011-03-24 18:39:54 UTC (rev 35757)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2011-03-24 21:07:54 UTC (rev 35758)
@@ -3228,7 +3228,7 @@
 
 static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr)
 {
-	uiLayout *box, *split, *row;
+	uiLayout *box, *split, *subrow, *row;
 
 	box= uiLayoutBox(layout);
 	split = uiLayoutSplit(box, 0.45, 0);
@@ -3236,7 +3236,11 @@
 	row= uiLayoutRow(split, 1);
 	uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP);
 	uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN);
-	uiItemR(row, ptr, "frequency", 0, "Freq", ICON_NONE);
+
+	subrow=uiLayoutRow(row, 0);
+	uiLayoutSetActive(subrow, (RNA_boolean_get(ptr, "use_pulse_true_level")
+							|| RNA_boolean_get(ptr, "use_pulse_false_level")));
+	uiItemR(subrow, ptr, "frequency", 0, "Freq", ICON_NONE);
 	
 	row= uiLayoutRow(split, 1);
 	uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
@@ -3683,7 +3687,7 @@
 
 	row= uiLayoutRow(layout, 0);
 	uiItemR(row, ptr, "play_mode", 0, "", ICON_NONE);
-	uiItemR(row, ptr, "action", 0, NULL, ICON_NONE);
+	uiItemR(row, ptr, "action", 0, "", ICON_NONE);
 	uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
 
 	row= uiLayoutRow(layout, 0);
@@ -4275,7 +4279,7 @@
 
 	row= uiLayoutRow(layout, 0);
 	uiItemR(row, ptr, "mode", 0, "", ICON_NONE);
-	uiItemR(row, ptr, "action", 0, NULL, ICON_NONE);
+	uiItemR(row, ptr, "action", 0, "", ICON_NONE);
 	uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE);
 
 	row= uiLayoutRow(layout, 0);




More information about the Bf-blender-cvs mailing list