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 b97b7feb286aef5380097e5feddb72528f64c31a..9584d469f5d8ad577ab9e13ee047ec1f1675138d 100644 (file)
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2090,7 +2090,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
        if(icon == ICON_NONE || icon == ICON_DOT)
                icon= 0;
 
        if(icon == ICON_NONE || icon == ICON_DOT)
                icon= 0;
 

-       namebuf= RNA_struct_name_get_alloc(itemptr, NULL, 0);
+       namebuf= RNA_struct_name_get_alloc(itemptr, NULL, 0, NULL);

        name= (namebuf)? namebuf: "";
 
        /* hardcoded types */
        name= (namebuf)? namebuf: "";
 
        /* hardcoded types */


@@ -2275,7 +2275,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
 
                                if(found) {
                                        /* create button */
 
                                if(found) {
                                        /* create button */

-                                       name= RNA_struct_name_get_alloc(&itemptr, NULL, 0);
+                                       name= RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL);

                                        icon= list_item_icon_get(C, &itemptr, rnaicon, 0);
                                        uiItemL(row, (name)? name: "", icon);
 
                                        icon= list_item_icon_get(C, &itemptr, rnaicon, 0);
                                        uiItemL(row, (name)? name: "", icon);