[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23169] trunk/blender/source/blender: 2. 5 filebrowser

[Andrea Weikert]

Revision: 23169
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23169
Author:   elubie
Date:     2009-09-13 09:00:44 +0200 (Sun, 13 Sep 2009)

Log Message:
-----------
2.5 filebrowser
fix operator property name 'type' was used by sequencer for strip effect type. Changed to 'filemode' for file browser.

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

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-13 03:56:30 UTC (rev 23168)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-13 07:00:44 UTC (rev 23169)
@@ -124,7 +124,7 @@
 	if (op) {
 		BLI_strncpy(params->title, op->type->name, sizeof(params->title));
 
-		params->type = RNA_int_get(op->ptr, "type");
+		params->type = RNA_int_get(op->ptr, "filemode");
 
 		if (RNA_property_is_set(op->ptr, "path")) {
 			RNA_string_get(op->ptr, "path", name);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-09-13 03:56:30 UTC (rev 23168)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-09-13 07:00:44 UTC (rev 23169)
@@ -528,7 +528,7 @@
 	RNA_def_boolean(ot->srna, "filter_text", (filter & TEXTFILE), "Filter text files", "");
 	RNA_def_boolean(ot->srna, "filter_folder", (filter & FOLDERFILE), "Filter folders", "");
 
-	RNA_def_int(ot->srna, "type", type, FILE_LOADLIB, FILE_SPECIAL, 
+	RNA_def_int(ot->srna, "filemode", type, FILE_LOADLIB, FILE_SPECIAL, 
 		"File Browser Mode", "The setting for the file browser mode to load a .blend file, a library or a special file.",
 		FILE_LOADLIB, FILE_SPECIAL);
 }