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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-07-14 20:38:09 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-07-14 20:38:09 +0400
commit18c82ce390f017baff8fd3020a189512e980c7a9 (patch)
treed875d6c66adaa0591911397ca38fe87cb1cee37d /SConstruct
parent46f89336d644fd45d1960465637f67d0918a94bd (diff)
Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'.
This fixes problem after change to this new location, but with .pyc files still lingering in old tools/ directory that still got imported due to syspath form.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct15
1 files changed, 7 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct
index 09ada7d7f70..b11df1b4c67 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,19 +47,18 @@ import re
from tempfile import mkdtemp
# needed for importing tools
-sys.path.append(os.path.join(".", "build_files", "scons"))
+sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
-import tools.Blender
-import tools.btools
-import tools.bcolors
+import Blender
+import btools
+import bcolors
EnsureSConsVersion(1,0,0)
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
-VERSION = tools.btools.VERSION # This is used in creating the local config directories
+VERSION = btools.VERSION # This is used in creating the local config directories
### globals ###
platform = sys.platform