Commit: a094c395c0a9f846278c5434c9d6b504284d0a3e
Author: Dalai Felinto
Date: Fri Nov 14 10:34:00 2014 -0200
Branches: multiview
https://developer.blender.org/rBa094c395c0a9f846278c5434c9d6b504284d0a3e
Merge remote-tracking branch 'origin/master' into multiview
Conflicts:
source/blender/editors/space_image/image_buttons.c
===================================================================
===================================================================
diff --cc source/blender/editors/include/UI_interface.h
index 584746f,ebd0079..65321c3
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -875,11 -885,9 +885,11 @@@ void uiTemplateGameStates(uiLayout *lay
PointerRNA *used_ptr, const char *used_propname, int
active_state);
void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA
*ptr, const char *propname, struct PointerRNA *userptr, int compact);
void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, int
color_management);
+void uiTemplateImageStereo3d(uiLayout *layout, struct PointerRNA
*stereo3d_format_ptr);
+void uiTemplateImageViews(uiLayout *layout, struct PointerRNA *imfptr);
void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image
*ima, struct ImageUser *iuser);
void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
- void uiOperatorSearch_But(uiBut *but);
+ void UI_but_func_operator_search(uiBut *but);
void uiTemplateOperatorSearch(uiLayout *layout);
void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C);
diff --cc source/blender/editors/screen/area.c
index b962862,630ff8f..8a84972
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -494,9 -494,10 +494,9 @@@ void ED_region_do_draw(bContext *C, ARe
glDisable(GL_BLEND);
#endif
- ar->do_draw = 0;
memset(&ar->drawrct, 0, sizeof(ar->drawrct));
- uiFreeInactiveBlocks(C, &ar->uiblocks);
+ UI_blocklist_free_inactive(C, &ar->uiblocks);
if (sa && (win->screen->state != SCREENFULL)) {
region_draw_emboss(ar, &ar->winrct);
diff --cc source/blender/editors/space_image/image_buttons.c
index 7fda23c,c6fcf74..ff03636
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@@ -426,16 -424,9 +426,16 @@@ static void ui_imageuser_pass_menu(bCon
/* rendered results don't have a Combined pass */
for (rpass = rl ? rl->passes.last : NULL; rpass; rpass = rpass->prev,
nr--) {
+
+ /* just show one pass of each kind */
+ if (passflag & rpass->passtype)
+ continue;
+
+ passflag |= rpass->passtype;
+
final:
- uiDefButS(block, BUTM, B_NOP, IFACE_(rpass->internal_name), 0,
0,
- uiDefButS(block, UI_BTYPE_BUT_MENU, B_NOP, IFACE_(rpass->name),
0, 0,
- UI_UNIT_X * 5, UI_UNIT_X, &iuser->pass, (float) nr,
0.0, 0, -1, "");
++ uiDefButS(block, UI_BTYPE_BUT_MENU, B_NOP,
IFACE_(rpass->internal_name), 0, 0,
+ UI_UNIT_X * 5, UI_UNIT_X, &iuser->passtype, (float)
rpass->passtype, 0.0, 0, -1, "");
}
if (fake_name) {
@@@ -449,65 -440,6 +449,65 @@@
BKE_image_release_renderresult(scene, image);
}
+/**************************** view menus *****************************/
+static void ui_imageuser_view_menu_rr(bContext *UNUSED(C), uiLayout *layout,
void *rnd_pt)
+{
+ void **rnd_data = rnd_pt;
+ uiBlock *block = uiLayoutGetBlock(layout);
+ Image *image = rnd_data[0];
+ ImageUser *iuser = rnd_data[1];
+ RenderResult *rr;
+ RenderView *rview;
+ int nr;
+ Scene *scene = iuser->scene;
+
+ /* may have been freed since drawing */
+ rr = BKE_image_acquire_renderresult(scene, image);
+ if (UNLIKELY(rr == NULL)) {
+ return;
+ }
+
- uiBlockSetCurLayout(block, layout);
++ UI_block_layout_set_current(block, layout);
+ uiLayoutColumn(layout, false);
+
- uiDefBut(block, LABEL, 0, IFACE_("View"),
++ uiDefBut(block, UI_BTYPE_LABEL, 0, IFACE_("View"),
+ 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+
+ uiItemS(layout);
+
+ nr = (rr ? BLI_countlist(&rr->views) : 0) - 1;
+ for (rview = rr ? rr->views.last : NULL; rview; rview = rview->prev,
nr--) {
- uiDefButS(block, BUTM, B_NOP, IFACE_(rview->name), 0, 0,
++ uiDefButS(block, UI_BTYPE_BUT_MENU, B_NOP, IFACE_(rview->name),
0, 0,
+ UI_UNIT_X * 5, UI_UNIT_X, &iuser->view, (float) nr,
0.0, 0, -1, "");
+ }
+
+ BKE_image_release_renderresult(scene, image);
+}
+
+static void ui_imageuser_view_menu_multiview(bContext *UNUSED(C), uiLayout
*layout, void *rnd_pt)
+{
+ void **rnd_data = rnd_pt;
+ uiBlock *block = uiLayoutGetBlock(layout);
+ Image *image = rnd_data[0];
+ ImageUser *iuser = rnd_data[1];
+ int nr;
+ ImageView *iv;
+
- uiBlockSetCurLayout(block, layout);
++ UI_block_layout_set_current(block, layout);
+ uiLayoutColumn(layout, false);
+
- uiDefBut(block, LABEL, 0, IFACE_("View"),
++ uiDefBut(block, UI_BTYPE_LABEL, 0, IFACE_("View"),
+ 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+
+ uiItemS(layout);
+
+ nr = BLI_countlist(&image->views) - 1;
+ for (iv = image->views.last; iv; iv = iv->prev, nr--) {
- uiDefButS(block, BUTM, B_NOP, IFACE_(iv->name), 0, 0,
++ uiDefButS(block, UI_BTYPE_BUT_MENU, B_NOP, IFACE_(iv->name), 0,
0,
+ UI_UNIT_X * 5, UI_UNIT_X, &iuser->view, (float) nr,
0.0, 0, -1, "");
+ }
+}
+
/* 5 layer button callbacks... */
static void image_multi_cb(bContext *C, void *rr_v, void *iuser_v)
{
@@@ -647,50 -565,20 +647,50 @@@ static void uiblock_layer_pass_buttons(
rl = BLI_findlink(&rr->layers, rpass_index);
rnd_pt[2] = SET_INT_IN_POINTER(rpass_index);
- display_name = rl ? rl->name : (fake_name ? fake_name : "");
- but = uiDefMenuBut(block, ui_imageuser_layer_menu, rnd_pt,
display_name, 0, 0, wmenu2, UI_UNIT_Y, TIP_("Select Layer"));
- UI_but_func_set(but, image_multi_cb, rr, iuser);
- UI_but_type_set_menu_from_pulldown(but);
-
+ if (RE_layers_have_name(rr)) {
+ display_name = rl ? rl->name : (fake_name ? fake_name :
"");
+ but = uiDefMenuBut(block, ui_imageuser_layer_menu,
rnd_pt, display_name, 0, 0, wmenu2, UI_UNIT_Y, TIP_("Select Layer"));
- uiButSetFunc(but, image_multi_cb, rr, iuser);
- uiButSetMenuFromPulldown(but);
++ UI_but_func_set(but, image_multi_cb, rr, iuser);
++ UI_but_type_set_menu_from_pulldown(but);
+ }
/* pass */
fake_name = ui_imageuser_pass_fake_name(rl);
rpass = (rl ? BLI_findlink(&rl->passes, iuser->pass -
(fake_name ? 1 : 0)) : NULL);
- display_name = rpass ? rpass->name : (fake_name ? fake_name :
"");
+ display_name = rpass ? rpass->internal_name : (fake_name ?
fake_name : "");
but = uiDefMenuBut(block, ui_imageuser_pass_menu, rnd_pt,
display_name, 0, 0, wmenu3, UI_UNIT_Y, TIP_("Select Pass"));
- uiButSetFunc(but, image_multi_cb, rr, iuser);
- uiButSetMenuFromPulldown(but);
+ UI_but_func_set(but, image_multi_cb, rr, iuser);
+ UI_but_type_set_menu_from_pulldown(but);
+
+ /* view */
+ if (BLI_countlist(&rr->views) > 1 && !show_stereo) {
+ rview = BLI_findlink(&rr->views, iuser->view);
+ display_name = rview ? rview->name : "";
+
+ but = uiDefMenuBut(block, ui_imageuser_view_menu_rr,
rnd_pt, display_name, 0, 0, wmenu4, UI_UNIT_Y, TIP_("Select View"));
- uiButSetFunc(but, image_multi_cb, rr, iuser);
- uiButSetMenuFromPulldown(but);
++ UI_but_func_set(but, image_multi_cb, rr, iuser);
++ UI_but_type_set_menu_from_pulldown(but);
+ }
+ }
+
+ /* stereo image */
+ else if (((image->flag & IMA_IS_STEREO) && (!show_stereo)) ||
+ ((image->flag & IMA_IS_MULTIVIEW) && ((image->flag &
IMA_IS_STEREO) == 0)))
+ {
+ ImageView *iv;
+ int nr = 0;
+
+ for (iv = image->views.first; iv; iv = iv->next) {
+ if (nr++ == iuser->view) {
+ display_name = iv->name;
+ break;
+ }
+ }
+
+ but = uiDefMenuBut(block, ui_imageuser_view_menu_multiview,
rnd_pt, display_name, 0, 0, wmenu1, UI_UNIT_Y, TIP_("Select View"));
- uiButSetFunc(but, image_multiview_cb, image, iuser);
- uiButSetMenuFromPulldown(but);
++ UI_but_func_set(but, image_multiview_cb, image, iuser);
++ UI_but_type_set_menu_from_pulldown(but);
}
}
diff --cc source/blender/editors/space_image/image_ops.c
index dbf5c5f,1b86b60..eeddbbd
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@@ -954,9 -944,10 +954,9 @@@ typedef struct ImageFrame
static void image_open_init(bContext *C, wmOperator *op)
{
ImageOpenData *iod;
-
op->customdata = iod = MEM_callocN(sizeof(ImageOpenData), __func__);
iod->iuser = CTX_data_pointer_get_type(C, "image_user",
&RNA_ImageUser).data;
- uiIDContextProperty(C, &iod->pprop.ptr, &iod->pprop.prop);
+ UI_context_active_but_prop_get_templateID(C, &iod->pprop.ptr,
&iod->pprop.prop);
}
static void image_open_cancel(bContext *UNUSED(C), wmOperator *op)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
