svn merge ^/trunk/blender -r41961:41998

[blender-staging.git] / source / blender / makesrna / intern / rna_scene.c

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index afe11656aeef0eb77853c01d8d1fa6a1da39d255..ee3193b54299d7f7b4a867c725b4cc7f7bea823c 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1125,8 +1125,8 @@ static void rna_def_transform_orientation(BlenderRNA *brna)
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
        
        prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
-       RNA_def_property_string_sdna(prop, NULL, "name");
        RNA_def_struct_name_property(srna, prop);
+       RNA_def_property_ui_text(prop, "Name", "Name of the custom transform orientation");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 }