[Bf-blender-cvs] [a985bf7] blender-v2.76-release: Multiview: fix Image Editor not showing Views menu when rendering non-stereo Multi-View camera rigs (unreported)
Dalai Felinto
noreply at git.blender.org
Wed Sep 30 17:10:28 CEST 2015
Commit: a985bf73e5e47eb07e4fb66c965487efcd9d3716
Author: Dalai Felinto
Date: Thu Sep 24 08:34:54 2015 -0300
Branches: blender-v2.76-release
https://developer.blender.org/rBa985bf73e5e47eb07e4fb66c965487efcd9d3716
Multiview: fix Image Editor not showing Views menu when rendering
non-stereo Multi-View camera rigs (unreported)
===================================================================
M source/blender/editors/space_image/image_buttons.c
===================================================================
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 3af210f..6b5cc38 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -644,7 +644,7 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, Image *image, RenderRes
int wmenu1, wmenu2, wmenu3, wmenu4;
const char *fake_name;
const char *display_name = "";
- const bool show_stereo = (iuser->flag & IMA_SHOW_STEREO);
+ const bool show_stereo = (iuser->flag & IMA_SHOW_STEREO) != 0;
uiLayoutRow(layout, true);
@@ -702,7 +702,9 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, Image *image, RenderRes
UI_but_type_set_menu_from_pulldown(but);
/* view */
- if (BLI_listbase_count_ex(&rr->views, 2) > 1 && !show_stereo) {
+ if (BLI_listbase_count_ex(&rr->views, 2) > 1 &&
+ ((!show_stereo) || (!RE_RenderResult_is_stereo(rr))))
+ {
rview = BLI_findlink(&rr->views, iuser->view);
display_name = rview ? rview->name : "";
More information about the Bf-blender-cvs
mailing list