[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57341] trunk/blender/source/blender: correction to typo in r57327, ui-load wasnt working on splash screen.

Campbell Barton ideasman42 at gmail.com
Mon Jun 10 12:55:57 CEST 2013


Revision: 57341
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57341
Author:   campbellbarton
Date:     2013-06-10 10:55:57 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
correction to typo in r57327, ui-load wasnt working on splash screen.

also minor changes:
- update the load-UI flag when changing in the preferences.
- remove unused initialization values for subdivide.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57327

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-06-10 10:45:25 UTC (rev 57340)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-06-10 10:55:57 UTC (rev 57341)
@@ -209,8 +209,8 @@
 	}
 
 	if (params->use_fractal) {
-		float len = len_v3v3(vsta->co, vend->co);
-		float normal[3] = {0.0f, 0.0f, 0.0f}, co2[3], base1[3], base2[3];
+		const float len = len_v3v3(vsta->co, vend->co);
+		float normal[3], co2[3], base1[3], base2[3];
 
 		fac = params->fractal * len;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2013-06-10 10:45:25 UTC (rev 57340)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2013-06-10 10:55:57 UTC (rev 57341)
@@ -152,6 +152,13 @@
 	else G.f |=  G_SCRIPT_AUTOEXEC;
 }
 
+static void rna_userdef_load_ui_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	UserDef *userdef = (UserDef *)ptr->data;
+	if (userdef->flag & USER_FILENOUI) G.fileflags |= G_FILE_NO_UI;
+	else G.fileflags &= ~G_FILE_NO_UI;
+}
+
 static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
@@ -3907,6 +3914,7 @@
 	prop = RNA_def_property(srna, "use_load_ui", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_FILENOUI);
 	RNA_def_property_ui_text(prop, "Load UI", "Load user interface setup when loading .blend files");
+	RNA_def_property_update(prop, 0, "rna_userdef_load_ui_update");
 
 	prop = RNA_def_property(srna, "font_directory", PROP_STRING, PROP_DIRPATH);
 	RNA_def_property_string_sdna(prop, NULL, "fontdir");

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-06-10 10:45:25 UTC (rev 57340)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-06-10 10:55:57 UTC (rev 57341)
@@ -1922,7 +1922,7 @@
 	if (!RNA_property_is_set(op->ptr, prop)) {
 		RNA_property_boolean_set(op->ptr, prop, use_prefs ?
 		                         (U.flag & USER_FILENOUI) == 0 :
-		                         (G.fileflags |= G_FILE_NO_UI) == 0);
+		                         (G.fileflags & G_FILE_NO_UI) == 0);
 	}
 }
 




More information about the Bf-blender-cvs mailing list