[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12008] branches/2-44-stable/blender/ release/scripts/console.py: console was trying to execute console_autoexec. py even if it wasnt there
Campbell Barton
cbarton at metavr.com
Tue Sep 11 12:06:14 CEST 2007
Revision: 12008
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12008
Author: campbellbarton
Date: 2007-09-11 12:06:14 +0200 (Tue, 11 Sep 2007)
Log Message:
-----------
console was trying to execute console_autoexec.py even if it wasnt there
Modified Paths:
--------------
branches/2-44-stable/blender/release/scripts/console.py
Modified: branches/2-44-stable/blender/release/scripts/console.py
===================================================================
--- branches/2-44-stable/blender/release/scripts/console.py 2007-09-11 09:36:47 UTC (rev 12007)
+++ branches/2-44-stable/blender/release/scripts/console.py 2007-09-11 10:06:14 UTC (rev 12008)
@@ -774,6 +774,7 @@
# Autoexec, startup code.
scriptDir = Get('scriptsdir')
+console_autoexec = None
if scriptDir:
if not scriptDir.endswith(Blender.sys.sep):
scriptDir += Blender.sys.sep
@@ -788,7 +789,10 @@
except:
cmdBuffer.append(cmdLine('...console_autoexec.py could not write, this is ok', 1, None))
scriptDir = None # make sure we only use this for console_autoexec.py
-
+
+ if not sys.exists(console_autoexec):
+ console_autoexec = None
+
else:
cmdBuffer.append(cmdLine('...Using existing console_autoexec.py in scripts dir', 1, None))
@@ -811,7 +815,7 @@
exec('%s%s' % ('__CONSOLE_VAR_DICT__["bpy"]=', 'bpy'))
-if scriptDir:
+if scriptDir and console_autoexec:
include_console(console_autoexec) # pass the blender module
#-end autoexec-----------------------------------------------------------------#
More information about the Bf-blender-cvs
mailing list