[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50912] trunk/blender: fix for cycles/ python script error in normal panel

Campbell Barton ideasman42 at gmail.com
Wed Sep 26 21:23:07 CEST 2012


Revision: 50912
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50912
Author:   campbellbarton
Date:     2012-09-26 19:23:06 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
fix for cycles/python script error in normal panel

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-09-26 14:53:41 UTC (rev 50911)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-09-26 19:23:06 UTC (rev 50912)
@@ -456,7 +456,7 @@
         col.prop(mesh, "show_double_sided")
 
         col = split.column()
-        prop.label()
+        col.label()
 
 
 class CyclesObject_PT_ray_visibility(CyclesButtonsPanel, Panel):

Modified: trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp	2012-09-26 14:53:41 UTC (rev 50911)
+++ trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp	2012-09-26 19:23:06 UTC (rev 50912)
@@ -118,7 +118,8 @@
 
 		if (this->getbNodeGroup()) {
 			editorTree = (bNodeTree *) getbNodeGroup()->id;
-		} else {
+		}
+		else {
 			editorTree = (bNodeTree *) context->getbNodeTree();
 		}
 

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2012-09-26 14:53:41 UTC (rev 50911)
+++ trunk/blender/source/blender/editors/transform/transform.c	2012-09-26 19:23:06 UTC (rev 50912)
@@ -332,6 +332,9 @@
 
 			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);




More information about the Bf-blender-cvs mailing list