[Bf-blender-cvs] [062d1f7b4e] app-templates: Minor sync with master

Campbell Barton noreply at git.blender.org
Thu Mar 23 01:15:25 CET 2017


Commit: 062d1f7b4e4d25bbd6d9096ef6dce1f19e72757c
Author: Campbell Barton
Date:   Thu Mar 23 11:15:38 2017 +1100
Branches: app-templates
https://developer.blender.org/rB062d1f7b4e4d25bbd6d9096ef6dce1f19e72757c

Minor sync with master

===================================================================

M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index a4dde1fdb4..d76452edb8 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -485,7 +485,7 @@ typedef struct UserDef {
 	struct ListBase addons;
 	struct ListBase autoexec_paths;
 	char keyconfigstr[64];
-
+	
 	short undosteps;
 	short undomemory;
 	short gp_manhattendist, gp_euclideandist, gp_eraser;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 63e9b41e63..da167f7ffc 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -741,9 +741,6 @@ int wm_homefile_read(
 	if (!use_factory_settings || (filepath_startup[0] != '\0')) {
 		if (BLI_access(filepath_startup, R_OK) == 0) {
 			success = (BKE_blendfile_read(C, filepath_startup, NULL, skip_flags) != BKE_BLENDFILE_READ_FAIL);
-			if (success) {
-				printf("Read startup: %s\n", filepath_startup);
-			}
 		}
 		if (BLI_listbase_is_empty(&U.themes)) {
 			if (G.debug & G_DEBUG)




More information about the Bf-blender-cvs mailing list