diff options
| -rw-r--r-- | release/scripts/op/wm.py | 2 | ||||
| -rw-r--r-- | release/scripts/templates/operator_modal.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py index 4325475c130..a6ecfe21375 100644 --- a/release/scripts/op/wm.py +++ b/release/scripts/op/wm.py @@ -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'} diff --git a/release/scripts/templates/operator_modal.py b/release/scripts/templates/operator_modal.py index ee2e134dbde..b2839efabe4 100644 --- a/release/scripts/templates/operator_modal.py +++ b/release/scripts/templates/operator_modal.py @@ -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'} diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 4f650f0ed42..a38f4c12c63 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -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"); |