[Bf-blender-cvs] [266e1b3] master: Fix T38680: File output subpath file-select operator uses absolute path.

Lukas Tönne noreply at git.blender.org
Mon Feb 17 17:22:01 CET 2014


Commit: 266e1b3b4f67ba320af16f4a1f806e49c3f9de25
Author: Lukas Tönne
Date:   Mon Feb 17 17:13:36 2014 +0100
https://developer.blender.org/rB266e1b3b4f67ba320af16f4a1f806e49c3f9de25

Fix T38680: File output subpath file-select operator uses absolute path.

This is because the sub-paths of the individual sockets are defined as
FILEPATH properties, which automatically adds the standard fileselect
operator button in the uiLists. However, that operator returns full
paths only, with no direct way to make them relative to the base path.

So for now i've turned the subpath properties into regular strings,
which removes these operator buttons but should at least avoid the
confusion.

Eventually new operators could be defined for this, which use the file-
select operator and then make the path relative.

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

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

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

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index c00c934..d893a8c 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -4243,7 +4243,7 @@ static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "format", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ImageFormatSettings");
 	
-	prop = RNA_def_property(srna, "path", PROP_STRING, PROP_FILEPATH);
+	prop = RNA_def_property(srna, "path", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "path");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_NodeOutputFileSlotFile_path_set");
 	RNA_def_struct_name_property(srna, prop);




More information about the Bf-blender-cvs mailing list