[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27123] trunk/blender: [#21295] Escape key doesn't cancel python modal operators

[Campbell Barton]

Revision: 27123
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27123
Author:   campbellbarton
Date:     2010-02-24 16:56:27 +0100 (Wed, 24 Feb 2010)

Log Message:
-----------
[#21295] Escape key doesn't cancel python modal operators
also fix distance with lamps being negative for typed in values.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/wm.py
    trunk/blender/release/scripts/templates/operator_modal.py
    trunk/blender/source/blender/makesrna/intern/rna_lamp.c

Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py	2010-02-24 15:35:15 UTC (rev 27122)
+++ trunk/blender/release/scripts/op/wm.py	2010-02-24 15:56:27 UTC (rev 27123)
@@ -364,7 +364,7 @@
             self._values_clear()
             return {'FINISHED'}
 
-        elif event_type in ('RIGHTMOUSE', 'ESCAPE'):
+        elif event_type in ('RIGHTMOUSE', 'ESC'):
             self._values_restore()
             return {'FINISHED'}
 

Modified: trunk/blender/release/scripts/templates/operator_modal.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal.py	2010-02-24 15:35:15 UTC (rev 27122)
+++ trunk/blender/release/scripts/templates/operator_modal.py	2010-02-24 15:56:27 UTC (rev 27123)
@@ -16,7 +16,7 @@
         elif event.type == 'LEFTMOUSE':
             return {'FINISHED'}
 
-        elif event.type in ('RIGHTMOUSE', 'ESCAPE'):
+        elif event.type in ('RIGHTMOUSE', 'ESC'):
             context.object.location.x = self.properties.first_value
             return {'CANCELLED'}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2010-02-24 15:35:15 UTC (rev 27122)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2010-02-24 15:56:27 UTC (rev 27123)
@@ -346,6 +346,7 @@
 
 	prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "dist");
+	RNA_def_property_range(prop, 0, INT_MAX);
 	RNA_def_property_ui_range(prop, 0, 1000, 1, 2);
 	RNA_def_property_ui_text(prop, "Distance", "Falloff distance - the light is at half the original intensity at this point");
 	RNA_def_property_update(prop, 0, "rna_Lamp_draw_update");