Revision: 27770
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27770
Author: campbellbarton
Date: 2010-03-26 12:35:57 +0100 (Fri, 26 Mar 2010)
Log Message:
-----------
- game engine checking for autoexec was using the wrong global flag.
- 'Trusted Source' option was being overwritten on read making it usless.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2010-03-26 11:05:22 UTC (rev 27769)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2010-03-26 11:35:57 UTC (rev 27770)
@@ -261,6 +261,7 @@
/* we didn't succeed, now try to read Blender file */
if (retval== 0) {
+ int G_f= G.f;
ListBase wmbase;
/* put aside screens to match with persistant windows later */
@@ -270,6 +271,11 @@
retval= BKE_read_file(C, name, NULL, reports);
G.save_over = 1;
+ /* this flag is initialized by the operator but overwritten on
read.
+ * need to re-enable it here else drivers + registered scripts
wont work. */
+ if(G_f & G_SCRIPT_AUTOEXEC) G.f |= G_SCRIPT_AUTOEXEC;
+ else G.f &=
~G_SCRIPT_AUTOEXEC;
+
/* match the read WM with current WM */
wm_window_match_do(C, &wmbase);
WM_check(C); /* opens window(s), checks keymaps */
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-03-26 11:05:22 UTC (rev
27769)
+++ trunk/blender/source/creator/creator.c 2010-03-26 11:35:57 UTC (rev
27770)
@@ -1062,7 +1062,7 @@
}
else {
- if((G.fileflags & G_FILE_AUTOPLAY) && (G.fileflags &
G_SCRIPT_AUTOEXEC))
+ if((G.fileflags & G_FILE_AUTOPLAY) && (G.f & G_SCRIPT_AUTOEXEC))
WM_init_game(C);
else if(!G.file_loaded)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
