[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42534] trunk/blender: global is python keyword so cant use as operator argument,

[Campbell Barton]

Revision: 42534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42534
Author:   campbellbarton
Date:     2011-12-09 10:19:11 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
global is python keyword so cant use as operator argument,
also ran operator cheat sheet and made sure no syntax errors.

+ minor pep8 edits.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
    trunk/blender/release/scripts/startup/bl_operators/wm.py
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py	2011-12-09 10:02:01 UTC (rev 42533)
+++ trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py	2011-12-09 10:19:11 UTC (rev 42534)
@@ -22,6 +22,7 @@
 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 @@
 
         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:

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-12-09 10:02:01 UTC (rev 42533)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-12-09 10:19:11 UTC (rev 42534)
@@ -457,8 +457,8 @@
 
 
 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'}

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2011-12-09 10:02:01 UTC (rev 42533)
+++ trunk/blender/source/blender/editors/object/object_add.c	2011-12-09 10:19:11 UTC (rev 42534)
@@ -893,7 +893,7 @@
 {
 	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 @@
 	/* 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 ******************************/