Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-11-23 12:28:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-11-23 12:28:42 +0300
commit7617736bd1a628d6ea2300378e191c02bb4f5ad0 (patch)
tree46a3339e4c52708c03489da544458b4624b7aaea
parent8224dff9e24b71db5ba2099a9db782a1f241ad07 (diff)
fix for py errors and missing return
-rw-r--r--release/scripts/ui/properties_data_modifier.py8
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
index 5a308d08491..6fe0ded6efe 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/ui/properties_data_modifier.py
@@ -64,7 +64,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
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 @@ class DATA_PT_modifiers(DataButtonsPanel):
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 @@ class DATA_PT_modifiers(DataButtonsPanel):
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 @@ class DATA_PT_modifiers(DataButtonsPanel):
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()
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index ec8fc869d72..acb82283604 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -193,7 +193,7 @@ void view3d_clr_clipping(void)
}
}
-static test_clipping(float *vec, float clip[][4])
+static int test_clipping(float *vec, float clip[][4])
{
float view[3];
VECCOPY(view, vec);