fix for cycles/python script error in normal panel
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2012 19:23:06 +0000 (19:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2012 19:23:06 +0000 (19:23 +0000)
intern/cycles/blender/addon/ui.py
source/blender/compositor/nodes/COM_MuteNode.cpp
source/blender/editors/transform/transform.c

index 6d4a675..0080ff7 100644 (file)
@@ -456,7 +456,7 @@ class Cycles_PT_mesh_normals(CyclesButtonsPanel, Panel):
         col.prop(mesh, "show_double_sided")
 
         col = split.column()
-        prop.label()
+        col.label()
 
 
 class CyclesObject_PT_ray_visibility(CyclesButtonsPanel, Panel):
index ebee1f2..1821844 100644 (file)
@@ -118,7 +118,8 @@ void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co
 
                if (this->getbNodeGroup()) {
                        editorTree = (bNodeTree *) getbNodeGroup()->id;
-               } else {
+               }
+               else {
                        editorTree = (bNodeTree *) context->getbNodeTree();
                }
 
index 0292517..da84c03 100644 (file)
@@ -332,6 +332,9 @@ void projectIntView(TransInfo *t, const float vec[3], int adr[2])
 
                        UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr + 1);
                }
+               else {
+                       BLI_assert(0);
+               }
        }
        else if (t->spacetype == SPACE_NODE) {
                UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], adr, adr + 1);