[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42447] trunk/blender: remove invalid NULL checks from own recent commit and minor pep8 edits.

Campbell Barton ideasman42 at gmail.com
Mon Dec 5 23:19:36 CET 2011


Revision: 42447
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42447
Author:   campbellbarton
Date:     2011-12-05 22:19:30 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
remove invalid NULL checks from own recent commit and minor pep8 edits.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
    trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
    trunk/blender/source/blender/editors/screen/screendump.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2011-12-05 20:07:13 UTC (rev 42446)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2011-12-05 22:19:30 UTC (rev 42447)
@@ -725,6 +725,7 @@
         if experimental and cscene.device == 'CPU' and engine.with_osl():
             layout.prop(cscene, "shading_system")
 
+
 def draw_pause(self, context):
     layout = self.layout
     scene = context.scene

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-05 20:07:13 UTC (rev 42446)
+++ trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py	2011-12-05 22:19:30 UTC (rev 42447)
@@ -62,7 +62,9 @@
             else:
                 org_sca_x, org_sca_y, org_sca_z = obj.scale
 
-            sca_x, sca_y, sca_z = uniform(-scale[0]+2, scale[0]), uniform(-scale[1]+2, scale[1]), uniform(-scale[2]+2, scale[2])
+            sca_x, sca_y, sca_z = (uniform(-scale[0] + 2.0, scale[0]),
+                                   uniform(-scale[1] + 2.0, scale[1]),
+                                   uniform(-scale[2] + 2.0, scale[2]))
 
             if scale_even:
                 aX = sca_x * org_sca_x
@@ -81,7 +83,10 @@
             uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
 
 
-from bpy.props import IntProperty, BoolProperty, FloatProperty, FloatVectorProperty
+from bpy.props import (IntProperty,
+                       BoolProperty,
+                       FloatProperty,
+                       FloatVectorProperty)
 
 
 class RandomizeLocRotSize(Operator):

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-12-05 20:07:13 UTC (rev 42446)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-12-05 22:19:30 UTC (rev 42447)
@@ -166,7 +166,7 @@
             layout.template_preview(tex, parent=idblock, slot=slot)
         else:
             layout.template_preview(tex, slot=slot)
-            
+
         #Show Alpha Button for Brush Textures, see #29502
         if context.space_data.texture_context == 'BRUSH':
             layout.prop(tex, "use_preview_alpha")

Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c	2011-12-05 20:07:13 UTC (rev 42446)
+++ trunk/blender/source/blender/editors/screen/screendump.c	2011-12-05 22:19:30 UTC (rev 42447)
@@ -218,8 +218,6 @@
 
 void SCREEN_OT_screenshot(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
 	ot->name= "Save Screenshot"; /* weak: opname starting with 'save' makes filewindow give save-over */
 	ot->idname= "SCREEN_OT_screenshot";
 	
@@ -231,7 +229,7 @@
 	ot->flag= 0;
 	
 	WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH);
-	prop= RNA_def_boolean(ot->srna, "full", 1, "Full Screen", "");
+	RNA_def_boolean(ot->srna, "full", 1, "Full Screen", "");
 }
 
 /* *************** screenshot movie job ************************* */

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-12-05 20:07:13 UTC (rev 42446)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-12-05 22:19:30 UTC (rev 42447)
@@ -2986,7 +2986,7 @@
 	int /* totvert,*/ totedge, totface;
 	DerivedMesh *dm= mesh_get_derived_final(scene, ob, scene->customdata_mask);
 	ModifierData *md = NULL;
-	const short is_obact= (ob != NULL && ob == OBACT);
+	const short is_obact= (ob == OBACT);
 	int draw_flags = (is_obact && paint_facesel_test(ob)) ? DRAW_FACE_SELECT : 0;
 
 	if(!dm)
@@ -6108,7 +6108,7 @@
 	int /*sel, drawtype,*/ colindex= 0;
 	int i, selstart, selend, empty_object=0;
 	short dt, dtx, zbufoff= 0;
-	const short is_obact= (ob != NULL && ob == OBACT);
+	const short is_obact= (ob == OBACT);
 
 	/* only once set now, will be removed too, should become a global standard */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);




More information about the Bf-blender-cvs mailing list