diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_MuteNode.cpp | 3 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 6d4a6750203..0080ff75ddd 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -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): diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp index ebee1f25455..1821844c6f5 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.cpp +++ b/source/blender/compositor/nodes/COM_MuteNode.cpp @@ -118,7 +118,8 @@ void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co if (this->getbNodeGroup()) { editorTree = (bNodeTree *) getbNodeGroup()->id; - } else { + } + else { editorTree = (bNodeTree *) context->getbNodeTree(); } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 029251702a9..da84c039bd9 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -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); |