diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-09 14:19:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-09 14:19:11 +0400 |
| commit | 2827f57f624cad8b2dec90ec8b94e115bf98268b (patch) | |
| tree | 960be09bab1c6c4be631ac4ff0f1d8cdecbb4364 | |
| parent | f025b7b51159cf3cdf49e9ec0eeaf4427010e1f7 (diff) | |
global is python keyword so cant use as operator argument,
also ran operator cheat sheet and made sure no syntax errors.
+ minor pep8 edits.
| -rw-r--r-- | release/scripts/startup/bl_operators/object_randomize_transform.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/object_randomize_transform.py b/release/scripts/startup/bl_operators/object_randomize_transform.py index 319fd1526fb..fa36e48d47b 100644 --- a/release/scripts/startup/bl_operators/object_randomize_transform.py +++ b/release/scripts/startup/bl_operators/object_randomize_transform.py @@ -22,6 +22,7 @@ import bpy from bpy.types import Operator from mathutils import Vector + def randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min): import random @@ -44,9 +45,9 @@ def randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min): if rot: vec = rand_vec(rot) - + rotation_mode = obj.rotation_mode - if rotation_mode in ('QUATERNION', 'AXIS_ANGLE'): + if rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}: obj.rotation_mode = 'XYZ' if delta: diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 14c9a090529..89029e3af01 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -457,8 +457,8 @@ class WM_OT_context_cycle_enum(Operator): class WM_OT_context_cycle_array(Operator): - '''Set a context array value. - Useful for cycling the active mesh edit mode''' + '''Set a context array value. ''' + '''Useful for cycling the active mesh edit mode''' bl_idname = "wm.context_cycle_array" bl_label = "Context Array Cycle" bl_options = {'UNDO', 'INTERNAL'} diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 855b67b71bc..8c60a4d5868 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -893,7 +893,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) { Main *bmain= CTX_data_main(C); Scene *scene= CTX_data_scene(C); - const short use_global= RNA_boolean_get(op->ptr, "global"); + const short use_global= RNA_boolean_get(op->ptr, "use_global"); /* int islamp= 0; */ /* UNUSED */ if(CTX_data_edit_object(C)) @@ -951,7 +951,7 @@ void OBJECT_OT_delete(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "global", 0, "Delete Globally", "Remove object from all scenes"); + RNA_def_boolean(ot->srna, "use_global", 0, "Delete Globally", "Remove object from all scenes"); } /**************************** Copy Utilities ******************************/ |