Merging r58073 through r58111 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / interface / interface_templates.c
index 699da98225a2435c187bd6e5b85bb15f47236a45..8caa059d168cbea45459857da5385f2c0bd8f748 100644 (file)
@@ -3020,16 +3020,16 @@ static void template_keymap_item_properties(uiLayout *layout, const char *title,
                /* recurse for nested properties */
                if (RNA_property_type(prop) == PROP_POINTER) {
                        PointerRNA propptr = RNA_property_pointer_get(ptr, prop);
-                       const char *name = RNA_property_ui_name(prop);
 
                        if (propptr.data && RNA_struct_is_a(propptr.type, &RNA_OperatorProperties)) {
+                               const char *name = RNA_property_ui_name(prop);
                                template_keymap_item_properties(layout, name, &propptr);
                                continue;
                        }
                }
 
                /* add property */
-               uiItemR(flow, ptr, RNA_property_identifier(prop), 0, NULL, ICON_NONE);
+               uiItemFullR(flow, ptr, prop, -1, 0, 0, NULL, ICON_NONE);
        }
        RNA_STRUCT_END;
 }