[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50536] trunk/blender/source/blender: bugfix [#32538] 'Mouse Over Any' sensor 'Pulse' button missing since 2.5x [Patch] - based on the patch from HG1

[Dalai Felinto]

Revision: 50536
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50536
Author:   dfelinto
Date:     2012-09-11 22:55:14 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
bugfix [#32538] 'Mouse Over Any' sensor 'Pulse' button missing since 2.5x [Patch] - based on the patch from HG1

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

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2012-09-11 18:41:32 UTC (rev 50535)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2012-09-11 22:55:14 UTC (rev 50536)
@@ -3398,7 +3398,13 @@
 
 static void draw_sensor_mouse(uiLayout *layout, PointerRNA *ptr)
 {
-	uiItemR(layout, ptr, "mouse_event", 0, NULL, ICON_NONE);
+	uiLayout *split;
+
+	split = uiLayoutSplit(layout, 0.8f, FALSE);
+	uiItemR(split, ptr, "mouse_event", 0, NULL, ICON_NONE);
+
+	if (RNA_enum_get(ptr, "mouse_event") == BL_SENS_MOUSE_MOUSEOVER_ANY)
+		uiItemR(split, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
 }
 
 static void draw_sensor_near(uiLayout *layout, PointerRNA *ptr)

Modified: trunk/blender/source/blender/makesrna/intern/rna_sensor.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sensor.c	2012-09-11 18:41:32 UTC (rev 50535)
+++ trunk/blender/source/blender/makesrna/intern/rna_sensor.c	2012-09-11 22:55:14 UTC (rev 50536)
@@ -417,6 +417,11 @@
 	RNA_def_property_enum_items(prop, mouse_event_items);
 	RNA_def_property_ui_text(prop, "Mouse Event", "Type of event this mouse sensor should trigger on");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
+
+	prop = RNA_def_property(srna, "use_pulse", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SENS_MOUSE_FOCUS_PULSE);
+	RNA_def_property_ui_text(prop, "Pulse", "Moving the mouse over a different object generates a pulse");
+	RNA_def_property_update(prop, NC_LOGIC, NULL);
 }
 
 static void rna_def_touch_sensor(BlenderRNA *brna)