diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-15 11:04:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-15 11:04:11 +0300 |
| commit | b65a56ccb52e656cbdc9033180c26fb56d5c5ffd (patch) | |
| tree | 7f21f7388fc39c19f3eff4333f50c5b72f2becba /source/blender/blenkernel/intern/blender.c | |
| parent | b332a27429f40ef51deeff8de163d2280edb2314 (diff) | |
fix [#26494] Auto run Python scripts option in User Preferences problem
- opening a file with blender by passing it as an argument would and loading it once in blender left script auto execute flag in a different state.
- command line args --enable/disable-autoexec were being overridden by the user prefs.
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 3c996006f5d..9fb36d8f6b7 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -271,12 +271,11 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filename } /* special cases, override loaded flags: */ - if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG; - else bfd->globalf &= ~G_DEBUG; - if (G.f & G_SWAP_EXCHANGE) bfd->globalf |= G_SWAP_EXCHANGE; - else bfd->globalf &= ~G_SWAP_EXCHANGE; - if (G.f & G_SCRIPT_AUTOEXEC) bfd->globalf |= G_SCRIPT_AUTOEXEC; - else bfd->globalf &= ~G_SCRIPT_AUTOEXEC; + if(G.f != bfd->globalf) { + const int flags_keep= (G_DEBUG | G_SWAP_EXCHANGE | G_SCRIPT_AUTOEXEC | G_SCRIPT_OVERRIDE_PREF); + bfd->globalf= (bfd->globalf & ~flags_keep) | (G.f & flags_keep); + } + G.f= bfd->globalf; |