[Bf-blender-cvs] [0357a49] asset-experiments: Fix some 'minor' errors in fsmenuentry RNA name handling.

Bastien Montagne noreply at git.blender.org
Tue Dec 23 12:30:13 CET 2014


Commit: 0357a4928fccaae86286564e0bb1b25f58c651c6
Author: Bastien Montagne
Date:   Mon Dec 22 16:01:19 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB0357a4928fccaae86286564e0bb1b25f58c651c6

Fix some 'minor' errors in fsmenuentry RNA name handling.

Still have a nice mem leak somewhere too... :/

===================================================================

M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 67776fc..c8e263e 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1388,7 +1388,14 @@ static int rna_SpaceFileBrowser_use_lib_get(PointerRNA *ptr)
 
 static void rna_FileBrowser_FSMenuEntry_name_get(PointerRNA *ptr, char *value)
 {
-	BLI_strncpy(value, fsmenu_entry_get_name(ptr->data), sizeof(value));
+	strcpy(value, fsmenu_entry_get_name(ptr->data));
+}
+
+static void rna_FileBrowser_FSMenuEntry_name_set(PointerRNA *ptr, const char *value)
+{
+	FSMenuEntry *fsm = ptr->data;
+
+	fsmenu_entry_set_name(fsm, value);
 }
 
 static int rna_FileBrowser_FSMenuEntry_name_get_editable(PointerRNA *ptr)
@@ -3595,7 +3602,7 @@ static void rna_def_filemenu_entry(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
-	RNA_def_property_string_funcs(prop, "rna_FileBrowser_FSMenuEntry_name_get", NULL, NULL);
+	RNA_def_property_string_funcs(prop, "rna_FileBrowser_FSMenuEntry_name_get", NULL, "rna_FileBrowser_FSMenuEntry_name_set");
 	RNA_def_property_editable_func(prop, "rna_FileBrowser_FSMenuEntry_name_get_editable");
 	RNA_def_property_ui_text(prop, "Name", "");




More information about the Bf-blender-cvs mailing list