Revision: 49558
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49558
Author: campbellbarton
Date: 2012-08-04 12:54:27 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/io/io_collada.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/screendump.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_clip/clip_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_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_node/node_view.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/text_ops.c
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 2012-08-04
12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2012-08-04
12:54:27 UTC (rev 49558)
@@ -422,7 +422,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | TEXTFILE, FILE_SPECIAL,
FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | TEXTFILE, FILE_SPECIAL,
FILE_OPENFILE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
}
/******************* text to object operator ********************/
@@ -1708,7 +1709,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | FTFONTFILE,
FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,
FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | FTFONTFILE,
FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
}
/******************* delete operator *********************/
Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c 2012-08-04
12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/io/io_collada.c 2012-08-04
12:54:27 UTC (rev 49558)
@@ -242,7 +242,8 @@
ot->ui = wm_collada_export_draw;
- WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE,
FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE,
FILE_BLENDER, FILE_SAVE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
RNA_def_boolean(ot->srna,
"apply_modifiers", 0, "Apply Modifiers",
@@ -319,6 +320,7 @@
ot->exec = wm_collada_import_exec;
ot->poll = WM_operator_winactive;
- WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE,
FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE,
FILE_BLENDER, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
}
#endif
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c
2012-08-04 12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/object/object_modifier.c
2012-08-04 12:54:27 UTC (rev 49558)
@@ -1361,7 +1361,8 @@
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
- WM_operator_properties_filesel(ot, FOLDERFILE | BTXFILE, FILE_SPECIAL,
FILE_SAVE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | BTXFILE, FILE_SPECIAL,
FILE_SAVE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
edit_modifier_properties(ot);
}
Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c
2012-08-04 12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/render/render_shading.c
2012-08-04 12:54:27 UTC (rev 49558)
@@ -750,7 +750,8 @@
prop = RNA_def_float_array(ot->srna, "layout", 12,
default_envmap_layout, 0.0f, 0.0f, "File layout", "Flat array describing the
X,Y position of each cube face in the output image, where 1 is the size of a
face - order is [+Z -Z +Y -X -Y +X] (use -1 to skip a face)", 0.0f, 0.0f);
RNA_def_property_flag(prop, PROP_HIDDEN);
- WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE | MOVIEFILE,
FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE | MOVIEFILE,
FILE_SPECIAL, FILE_SAVE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
}
static int envmap_clear_exec(bContext *C, wmOperator *UNUSED(op))
Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c 2012-08-04
12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/screen/screendump.c 2012-08-04
12:54:27 UTC (rev 49558)
@@ -266,7 +266,8 @@
ot->flag = 0;
- WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE,
FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE,
FILE_SPECIAL, FILE_SAVE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
RNA_def_boolean(ot->srna, "full", 1, "Full Screen", "Screenshot the
whole Blender window");
}
Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c 2012-08-04
12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c 2012-08-04
12:54:27 UTC (rev 49558)
@@ -186,7 +186,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,
FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in
memory");
RNA_def_boolean(ot->srna, "mono", FALSE, "Mono", "Mixdown the sound to
mono");
}
@@ -207,7 +208,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,
FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in
memory");
RNA_def_boolean(ot->srna, "mono", TRUE, "Mono", "Mixdown the sound to
mono");
}
@@ -659,7 +661,8 @@
ot->flag = OPTYPE_REGISTER;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE,
FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,
FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE,
FILE_SPECIAL, FILE_SAVE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
#ifdef WITH_AUDASPACE
RNA_def_int(ot->srna, "accuracy", 1024, 1, 16777216, "Accuracy",
"Sample accuracy, important for animation data (the lower the value, the more
accurate)", 1, 16777216);
RNA_def_enum(ot->srna, "container", container_items,
AUD_CONTAINER_FLAC, "Container", "File format");
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2012-08-04 12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2012-08-04 12:54:27 UTC (rev 49558)
@@ -230,7 +230,8 @@
ot->cancel = file_browse_cancel;
/* properties */
- WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
}
/* second operator, only difference from BUTTONS_OT_file_browse is
WM_FILESEL_DIRECTORY */
@@ -247,5 +248,6 @@
ot->cancel = file_browse_cancel;
/* properties */
- WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE,
WM_FILESEL_DIRECTORY | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_DIRECTORY |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
}
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-08-04
12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-08-04
12:54:27 UTC (rev 49558)
@@ -275,8 +275,7 @@
/* properties */
WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE,
- WM_FILESEL_RELPATH | WM_FILESEL_FILES |
WM_FILESEL_DIRECTORY,
- FILE_DEFAULTDISPLAY);
+ WM_FILESEL_RELPATH | WM_FILESEL_FILES |
WM_FILESEL_DIRECTORY, FILE_DEFAULTDISPLAY);
}
/******************* reload clip operator *********************/
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c
2012-08-04 12:53:22 UTC (rev 49557)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c
2012-08-04 12:54:27 UTC (rev 49558)
@@ -1214,7 +1214,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+ WM_operator_properties_filesel(ot, FOLDERFILE | SOUNDFILE | MOVIEFILE,
FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH,
FILE_DEFAULTDISPLAY);
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);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
