kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#21295] Escape key doesn't cancel python modal operators

Browse Source 
also fix distance with lamps being negative for typed in values.
This commit is contained in:
Campbell Barton 2010-02-24 15:56:27 +00:00
parent 03590eb8a9
commit a9307a4dd3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/op/wm.py
View File

@ -364,7 +364,7 @@ class WM_OT_context_modal_mouse(bpy.types.Operator):
self._values_clear()
return {'FINISHED'}
elif event_type in ('RIGHTMOUSE', 'ESCAPE'):
elif event_type in ('RIGHTMOUSE', 'ESC'):
self._values_restore()
return {'FINISHED'}

2
release/scripts/templates/operator_modal.py
View File

@ -16,7 +16,7 @@ class ModalOperator(bpy.types.Operator):
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'}

1
source/blender/makesrna/intern/rna_lamp.c
View File

@ -346,6 +346,7 @@ static void rna_def_lamp(BlenderRNA *brna)
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");