[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24799] trunk/blender: fix for py errors and missing return

Campbell Barton ideasman42 at gmail.com
Mon Nov 23 10:28:43 CET 2009


Revision: 24799
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24799
Author:   campbellbarton
Date:     2009-11-23 10:28:42 +0100 (Mon, 23 Nov 2009)

Log Message:
-----------
fix for py errors and missing return

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_modifier.py
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py	2009-11-23 02:27:52 UTC (rev 24798)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py	2009-11-23 09:28:42 UTC (rev 24799)
@@ -64,7 +64,7 @@
         col.label(text="Vertex Group::")
         col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
-        sub.active = md.vertex_group
+        sub.active = bool(md.vertex_group)
         sub.prop(md, "invert")
 
         split = layout.split()
@@ -283,7 +283,7 @@
         col.label(text="Vertex group:")
         col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
-        sub.active = md.vertex_group
+        sub.active = bool(md.vertex_group)
         sub.prop(md, "protect")
 
         if wide_ui:
@@ -359,7 +359,7 @@
             col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         sub = col.column()
-        sub.active = md.vertex_group
+        sub.active = bool(md.vertex_group)
         sub.prop(md, "invert")
 
     def MESH_DEFORM(self, layout, ob, md, wide_ui):
@@ -376,7 +376,7 @@
         col.prop_pointer(md, "vertex_group", ob, "vertex_groups", text="")
 
         sub = col.column()
-        sub.active = md.vertex_group
+        sub.active = bool(md.vertex_group)
         sub.prop(md, "invert")
 
         layout.separator()

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2009-11-23 02:27:52 UTC (rev 24798)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2009-11-23 09:28:42 UTC (rev 24799)
@@ -193,7 +193,7 @@
 	}
 }
 
-static test_clipping(float *vec, float clip[][4])
+static int test_clipping(float *vec, float clip[][4])
 {
 	float view[3];
 	VECCOPY(view, vec);





More information about the Bf-blender-cvs mailing list