Cycles: svn merge -r41182:41205 ^/trunk/blender

[blender-staging.git] / source / blender / editors / interface / interface_templates.c

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 34f9849fac74c32f945a975ce839e45a92e59727..9584d469f5d8ad577ab9e13ee047ec1f1675138d 100644 (file)
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -334,7 +334,7 @@ static const char *template_id_browse_tip(StructRNA *type)
        return N_("Browse ID data to be linked");
 }
 
-static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, StructRNA *type, int flag, const char *newop, const char *openop, const char *unlinkop)
+static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, StructRNA *type, short idcode, int flag, const char *newop, const char *openop, const char *unlinkop)
 {
        uiBut *but;
        uiBlock *block;
@@ -480,6 +480,9 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
                if((idfrom && idfrom->lib) || !editable)
                        uiButSetFlag(but, UI_BUT_DISABLED);
        }
+
+       if(idcode == ID_TE)
+               uiTemplateTextureShow(layout, C, &template->ptr, template->prop);
        
        uiBlockEndAlign(block);
 }
@@ -489,6 +492,7 @@ static void ui_template_id(uiLayout *layout, bContext *C, PointerRNA *ptr, const
        TemplateID *template;
        PropertyRNA *prop;
        StructRNA *type;
+       short idcode;
 
        prop= RNA_struct_find_property(ptr, propname);
 
@@ -509,14 +513,15 @@ static void ui_template_id(uiLayout *layout, bContext *C, PointerRNA *ptr, const
                flag |= UI_ID_OPEN;
 
        type= RNA_property_pointer_type(ptr, prop);
-       template->idlb= which_libbase(CTX_data_main(C), RNA_type_to_ID_code(type));
+       idcode= RNA_type_to_ID_code(type);
+       template->idlb= which_libbase(CTX_data_main(C), idcode);
        
        /* create UI elements for this template
         *      - template_ID makes a copy of the template data and assigns it to the relevant buttons
         */
        if(template->idlb) {
                uiLayoutRow(layout, 1);
-               template_ID(C, layout, template, type, flag, newop, openop, unlinkop);
+               template_ID(C, layout, template, type, idcode, flag, newop, openop, unlinkop);
        }
 
        MEM_freeN(template);
@@ -2550,6 +2555,9 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
        uiBlockSetEmboss(block, UI_EMBOSS);
        
        uiDefBut(block, LABEL, 0, report->message, UI_UNIT_X+10, 0, UI_UNIT_X+width, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");
+
+       /* XXX linking hack */
+       uiTemplateNodeView(NULL, NULL, NULL, NULL, NULL);
 }
 
 /********************************* Keymap *************************************/