[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33768] trunk/blender/source/blender/ makesrna/intern: Bug fix: some file browser buttons didn' t return filename even though they were supposed to

Janne Karhu jhkarh at gmail.com
Sat Dec 18 17:52:17 CET 2010


Revision: 33768
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33768
Author:   jhk
Date:     2010-12-18 17:52:17 +0100 (Sat, 18 Dec 2010)

Log Message:
-----------
Bug fix: some file browser buttons didn't return filename even though they were supposed to
* It working before was actually a bug that got fixed by ton in r33663.
* Now the property subtype is correct and things work like they should.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c	2010-12-18 15:03:31 UTC (rev 33767)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c	2010-12-18 16:52:17 UTC (rev 33768)
@@ -266,7 +266,7 @@
 	RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse fluid frames");
 	RNA_def_property_update(prop, 0, "rna_fluid_find_enframe");
 
-	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH);
+	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_maxlength(prop, 240);
 	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
 	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store baked fluid simulation files in");
@@ -503,7 +503,7 @@
 	RNA_def_property_range(prop, 0.0, 2.0);
 	RNA_def_property_ui_text(prop, "Alpha Influence", "Amount of particle alpha change, inverse of size influence: 0=off (all same alpha), 1=full. (large particles get lower alphas, smaller ones higher values)");
 
-	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH);
+	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_maxlength(prop, 240);
 	RNA_def_property_string_sdna(prop, NULL, "surfdataPath");
 	RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store and load particles from");

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2010-12-18 15:03:31 UTC (rev 33767)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2010-12-18 16:52:17 UTC (rev 33768)
@@ -1297,7 +1297,7 @@
 	
 	RNA_def_struct_sdna_from(srna, "NodeImageFile", "storage");
 	
-	prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH);
+	prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "File Path", "Output path for the image, same functionality as render output.");
 	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-12-18 15:03:31 UTC (rev 33767)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-12-18 16:52:17 UTC (rev 33768)
@@ -2681,7 +2681,7 @@
 	RNA_def_property_ui_text(prop, "Display", "Select where rendered images will be displayed");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
-	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH);
+	prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "pic");
 	RNA_def_property_ui_text(prop, "Output Path", "Directory/name to save animations, # characters defines the position and length of frame numbers");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);





More information about the Bf-blender-cvs mailing list