Revision: 26482
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26482
Author: aligorith
Date: 2010-02-01 00:07:32 +0100 (Mon, 01 Feb 2010)
Log Message:
-----------
Renamed the FILE_OPEN option for the file browser to FILE_OPENFILE to cleanup
compiler warnings about redefined definitions (mingw)
Modified Paths:
--------------
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2010-01-31
22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2010-01-31
23:07:32 UTC (rev 26482)
@@ -420,7 +420,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL,
FILE_OPENFILE);
}
/******************* paste buffer operator ********************/
@@ -1642,7 +1642,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE, FILE_SPECIAL,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE, FILE_SPECIAL,
FILE_OPENFILE);
}
/******************* delete operator *********************/
Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c 2010-01-31
22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c 2010-01-31
23:07:32 UTC (rev 26482)
@@ -114,7 +114,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE);
RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in
memory.");
}
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2010-01-31 22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2010-01-31 23:07:32 UTC (rev 26482)
@@ -148,6 +148,6 @@
ot->cancel= file_browse_cancel;
/* properties */
- WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE);
}
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c
2010-01-31 22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c
2010-01-31 23:07:32 UTC (rev 26482)
@@ -1138,7 +1138,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE);
RNA_def_float(ot->srna, "low", 0.0f, 0.0, 100000.0, "Lowest frequency",
"", 0.1, 1000.00);
RNA_def_float(ot->srna, "high", 100000.0, 0.0, 100000.0, "Highest
frequency", "", 0.1, 1000.00);
RNA_def_float(ot->srna, "attack", 0.005, 0.0, 2.0, "Attack time", "",
0.01, 0.1);
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2010-01-31 22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2010-01-31 23:07:32 UTC (rev 26482)
@@ -741,7 +741,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE);
}
/******************** replace image operator ********************/
@@ -794,7 +794,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE);
}
/******************** save image as operator ********************/
Modified: trunk/blender/source/blender/editors/space_info/info_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_ops.c 2010-01-31
22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_info/info_ops.c 2010-01-31
23:07:32 UTC (rev 26482)
@@ -306,5 +306,5 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE);
}
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
2010-01-31 22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
2010-01-31 23:07:32 UTC (rev 26482)
@@ -342,7 +342,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE, FILE_SPECIAL,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE, FILE_SPECIAL,
FILE_OPENFILE);
sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_FILES);
RNA_def_boolean(ot->srna, "sound", TRUE, "Sound", "Load sound with the
movie");
}
@@ -379,7 +379,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL,
FILE_OPENFILE);
sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_FILES);
RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in
memory.");
}
@@ -465,7 +465,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL,
FILE_OPENFILE);
sequencer_generic_props__internal(ot,
SEQPROP_STARTFRAME|SEQPROP_ENDFRAME|SEQPROP_FILES);
}
@@ -608,7 +608,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE);
sequencer_generic_props__internal(ot,
SEQPROP_STARTFRAME|SEQPROP_ENDFRAME);
RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS,
"Type", "Sequencer effect type");
RNA_def_float_vector(ot->srna, "color", 3, NULL, 0.0f, 1.0f, "Color",
"Initialize the strip with this color (only used when type='COLOR')", 0.0f,
1.0f);
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2010-01-31
22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2010-01-31
23:07:32 UTC (rev 26482)
@@ -287,7 +287,7 @@
ot->poll= text_new_poll;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE,
FILE_SPECIAL, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE,
FILE_SPECIAL, FILE_OPENFILE);
}
/******************* reload operator *********************/
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2010-01-31
22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2010-01-31
23:07:32 UTC (rev 26482)
@@ -650,7 +650,7 @@
#define FILE_MAIN 2
#define FILE_LOADFONT 3
/* filesel op property -> action */
-#define FILE_OPEN 0
+#define FILE_OPENFILE 0
#define FILE_SAVE 1
/* sfile->flag and simasel->flag */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-01-31 22:56:19 UTC (rev 26481)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-01-31 23:07:32 UTC (rev 26482)
@@ -1361,7 +1361,7 @@
ot->exec= wm_open_mainfile_exec;
ot->poll= WM_operator_winactive;
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE,
FILE_BLENDER, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE,
FILE_BLENDER, FILE_OPENFILE);
RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface
setup in the .blend file.");
}
@@ -1519,7 +1519,7 @@
ot->flag |= OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE,
FILE_LOADLIB, FILE_OPEN);
+ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE,
FILE_LOADLIB, FILE_OPENFILE);
RNA_def_boolean(ot->srna, "link", 1, "Link", "Link the objects or
datablocks rather than appending.");
RNA_def_boolean(ot->srna, "autoselect", 1, "Select", "Select the linked
objects.");
@@ -1604,7 +1604,7 @@
ot->invoke= wm_recover_auto_save_invoke;
ot->poll= WM_operator_winactive;
- WM_operator_properties_filesel(ot, BLENDERFILE, FILE_BLENDER,
FILE_OPEN);
+ WM_operator_properties_filesel(ot, BLENDERFILE, FILE_BLENDER,
FILE_OPENFILE);
}
/* *************** save file as **************** */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
