Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-27 15:34:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-27 15:34:49 +0300
commit34857189bccb14f94076bce9728b5abbe92113ad (patch)
treebebde271064497bf00cf99361008aecd0a526ce3 /source/blender/blenkernel/intern/blender.c
parent820570031e3cd2b396b7bcf73f58fe16e20dcd3f (diff)
fixes for auto script execution, changing the user preference also updates the global flag.
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
-rw-r--r--source/blender/blenkernel/intern/blender.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index b96493704b5..171b48af974 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -291,8 +291,6 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename)
if (G.f & G_SWAP_EXCHANGE) bfd->globalf |= G_SWAP_EXCHANGE;
else bfd->globalf &= ~G_SWAP_EXCHANGE;
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE)) bfd->globalf &= ~G_SCRIPT_AUTOEXEC;
-
G.f= bfd->globalf;
if (!G.background) {