[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45888] trunk/blender/source/blender: corrections from an article about using PVS-Studio static checker with blender - http ://www.viva64.com/en/b/0145/

Campbell Barton ideasman42 at gmail.com
Mon Apr 23 17:54:44 CEST 2012


Revision: 45888
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45888
Author:   campbellbarton
Date:     2012-04-23 15:54:43 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
corrections from an article about using PVS-Studio static checker with blender - http://www.viva64.com/en/b/0145/

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2012-04-23 15:51:25 UTC (rev 45887)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2012-04-23 15:54:43 UTC (rev 45888)
@@ -2414,7 +2414,7 @@
 
 float uiLayoutGetScaleY(uiLayout *layout)
 {
-	return layout->scale[0];
+	return layout->scale[1];
 }
 
 /********************** Layout *******************/

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2012-04-23 15:51:25 UTC (rev 45887)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2012-04-23 15:54:43 UTC (rev 45888)
@@ -358,7 +358,7 @@
 					if (OB_TYPE_SUPPORT_MATERIAL(base->object->type)) {
 						/* don't use assign_material, it changed mat->id.us, which shows in the UI */
 						Material ***matar = give_matarar(base->object);
-						int actcol = MAX2(base->object->actcol > 0, 1) - 1;
+						int actcol = MAX2(base->object->actcol - 1, 0);
 
 						if (matar && actcol < base->object->totcol)
 							(*matar)[actcol] = mat;

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2012-04-23 15:51:25 UTC (rev 45887)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2012-04-23 15:54:43 UTC (rev 45888)
@@ -603,7 +603,7 @@
 static int rna_Object_active_material_index_get(PointerRNA *ptr)
 {
 	Object *ob = (Object*)ptr->id.data;
-	return MAX2(ob->actcol-1, 0);
+	return MAX2(ob->actcol - 1, 0);
 }
 
 static void rna_Object_active_material_index_set(PointerRNA *ptr, int value)

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c	2012-04-23 15:51:25 UTC (rev 45887)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c	2012-04-23 15:54:43 UTC (rev 45888)
@@ -511,8 +511,8 @@
 
 	BPY_BM_CHECK_OBJ(self);
 
-	if (start >= start) start = len - 1;
-	if (stop >= stop)   stop  = len - 1;
+	if (start >= len) start = len - 1;
+	if (stop  >= len) stop  = len - 1;
 
 	tuple = PyTuple_New(stop - start);
 




More information about the Bf-blender-cvs mailing list