[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27492] trunk/blender: user preference to disable the splash screen
Campbell Barton
ideasman42 at gmail.com
Sun Mar 14 19:08:13 CET 2010
Revision: 27492
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27492
Author: campbellbarton
Date: 2010-03-14 19:08:12 +0100 (Sun, 14 Mar 2010)
Log Message:
-----------
user preference to disable the splash screen
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-03-14 18:02:18 UTC (rev 27491)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-03-14 18:08:12 UTC (rev 27492)
@@ -279,6 +279,10 @@
col.label(text="Menu Open Delay:")
col.prop(view, "open_toplevel_delay", text="Top Level")
col.prop(view, "open_sublevel_delay", text="Sub Level")
+
+ col.separator()
+
+ col.prop(view, "show_splash")
class USERPREF_PT_edit(bpy.types.Panel):
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-03-14 18:02:18 UTC (rev 27491)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-03-14 18:08:12 UTC (rev 27492)
@@ -454,6 +454,7 @@
#define USER_CONTINUOUS_MOUSE (1 << 24)
#define USER_ZOOM_INVERT (1 << 25)
#define USER_ZOOM_DOLLY_HORIZ (1 << 26)
+#define USER_SPLASH_DISABLE (1 << 27)
/* Auto-Keying mode */
/* AUTOKEY_ON is a bitflag */
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-03-14 18:02:18 UTC (rev 27491)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-03-14 18:08:12 UTC (rev 27492)
@@ -1895,6 +1895,10 @@
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_VIEWPORTNAME);
RNA_def_property_ui_text(prop, "Show View Name", "Show the name of the view's direction in each 3D View");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+ prop= RNA_def_property(srna, "show_splash", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_SPLASH_DISABLE);
+ RNA_def_property_ui_text(prop, "Show Splash", "Display splash screen on startup");
prop= RNA_def_property(srna, "show_playback_fps", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_FPS);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2010-03-14 18:02:18 UTC (rev 27491)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2010-03-14 18:08:12 UTC (rev 27492)
@@ -173,13 +173,15 @@
void WM_init_splash(bContext *C)
{
- wmWindowManager *wm= CTX_wm_manager(C);
- wmWindow *prevwin= CTX_wm_window(C);
+ if((U.uiflag & USER_SPLASH_DISABLE) == 0) {
+ wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindow *prevwin= CTX_wm_window(C);
- if(wm->windows.first) {
- CTX_wm_window_set(C, wm->windows.first);
- WM_operator_name_call(C, "WM_OT_splash", WM_OP_INVOKE_DEFAULT, NULL);
- CTX_wm_window_set(C, prevwin);
+ if(wm->windows.first) {
+ CTX_wm_window_set(C, wm->windows.first);
+ WM_operator_name_call(C, "WM_OT_splash", WM_OP_INVOKE_DEFAULT, NULL);
+ CTX_wm_window_set(C, prevwin);
+ }
}
}
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-03-14 18:02:18 UTC (rev 27491)
+++ trunk/blender/source/creator/creator.c 2010-03-14 18:08:12 UTC (rev 27492)
@@ -196,7 +196,7 @@
printf ("Blender %d.%02d (sub %d) Build\n", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
printf ("Usage: blender [args ...] [file] [args ...]\n");
printf ("\nRender options:\n");
- printf (" -b <file>\tRender <file> in background (doesn't load the user defaults .B.blend file)\n");
+ printf (" -b <file>\tLoad <file> in background (often used for background rendering)\n");
printf (" -a render frames from start to end (inclusive), only works when used after -b\n");
printf (" -S <name>\tSet scene <name>\n");
printf (" -f <frame>\tRender frame <frame> and save it\n");
More information about the Bf-blender-cvs
mailing list