[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19210] branches/blender2.5/blender/source /blender/editors: 2.5 / SCons

Nathan Letwory jesterking at letwory.net
Fri Mar 6 15:58:38 CET 2009


Revision: 19210
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19210
Author:   jesterking
Date:     2009-03-06 15:58:37 +0100 (Fri, 06 Mar 2009)

Log Message:
-----------
2.5 / SCons
* make sure we can still compile WITH_BF_PYTHON=0

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_script/space_script.c
    branches/blender2.5/blender/source/blender/editors/space_text/SConscript

Modified: branches/blender2.5/blender/source/blender/editors/space_script/space_script.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_script/space_script.c	2009-03-06 14:12:12 UTC (rev 19209)
+++ branches/blender2.5/blender/source/blender/editors/space_script/space_script.c	2009-03-06 14:58:37 UTC (rev 19210)
@@ -157,10 +157,12 @@
 	/* data... */
 	// BPY_run_python_script(C, "/root/blender-svn/blender25/test.py", NULL);
 	
+#ifndef DISABLE_PYTHON
 	if (sscript->script) {
 		//BPY_run_python_script_space(scpt->script.filename, NULL);
 		BPY_run_script_space_draw(C, sscript);
 	}
+#endif
 	
 	/* reset view matrix */
 	UI_view2d_view_restore(C);

Modified: branches/blender2.5/blender/source/blender/editors/space_text/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/SConscript	2009-03-06 14:12:12 UTC (rev 19209)
+++ branches/blender2.5/blender/source/blender/editors/space_text/SConscript	2009-03-06 14:58:37 UTC (rev 19210)
@@ -10,4 +10,4 @@
 if not env['WITH_BF_PYTHON']:
 	defs.append('DISABLE_PYTHON')
 
-env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), [], libtype=['core'], priority=[95] )
+env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )





More information about the Bf-blender-cvs mailing list