[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29876] trunk/blender/source/blender/ editors/space_file/filesel.c: change to last commit.

Campbell Barton ideasman42 at gmail.com
Fri Jul 2 19:49:40 CEST 2010


Revision: 29876
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29876
Author:   campbellbarton
Date:     2010-07-02 19:49:40 +0200 (Fri, 02 Jul 2010)

Log Message:
-----------
change to last commit. if 'filepath' is not set check 'directory' and 'filename'.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/filesel.c

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2010-07-02 17:44:57 UTC (rev 29875)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2010-07-02 17:49:40 UTC (rev 29876)
@@ -134,9 +134,15 @@
 				BLI_split_dirfile(name, sfile->params->dir, sfile->params->file);
 			}
 		}
+		else {
+			if (RNA_struct_find_property(op->ptr, "directory") && RNA_property_is_set(op->ptr, "directory")) {
+				RNA_string_get(op->ptr, "directory", params->dir);
+				sfile->params->file[0]= '\0';
+			}
 
-		if (RNA_struct_find_property(op->ptr, "directory") && RNA_property_is_set(op->ptr, "directory")) {
-			RNA_string_get(op->ptr, "directory", params->dir);
+			if (RNA_struct_find_property(op->ptr, "filename") && RNA_property_is_set(op->ptr, "filename")) {
+				RNA_string_get(op->ptr, "filename", params->file);
+			}
 		}
 
 		if(params->dir[0]) {





More information about the Bf-blender-cvs mailing list