user preference to disable the splash screen
authorCampbell Barton <ideasman42@gmail.com>
Sun, 14 Mar 2010 18:08:12 +0000 (18:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 14 Mar 2010 18:08:12 +0000 (18:08 +0000)
release/scripts/ui/space_userpref.py
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c

index c8cb6d9..61c5141 100644 (file)
@@ -279,6 +279,10 @@ class USERPREF_PT_interface(bpy.types.Panel):
         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):
index 7ed30b3..4ebc259 100644 (file)
@@ -454,6 +454,7 @@ extern UserDef U; /* from blenkernel blender.c */
 #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 */
index 39619e4..8a1b37c 100644 (file)
@@ -1895,6 +1895,10 @@ static void rna_def_userdef_view(BlenderRNA *brna)
        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);
index f825bb2..8e3c931 100644 (file)
@@ -173,13 +173,15 @@ void WM_init(bContext *C, int argc, char **argv)
 
 void WM_init_splash(bContext *C)
 {
-       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((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);
+               }
        }
 }
 
index 91b4ed0..bf45a89 100644 (file)
@@ -196,7 +196,7 @@ static int print_help(int argc, char **argv, void *data)
        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");