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

[Nathan Letwory]

Revision: 18055
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18055
Author:   jesterking
Date:     2008-12-25 17:02:35 +0100 (Thu, 25 Dec 2008)

Log Message:
-----------
2.5 / SCons

Make sure we can build WITH_BF_PYTHON=False

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

Modified: 
branches/blender2.5/blender/source/blender/editors/space_script/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_script/SConscript  
2008-12-25 14:17:54 UTC (rev 18054)
+++ branches/blender2.5/blender/source/blender/editors/space_script/SConscript  
2008-12-25 16:02:35 UTC (rev 18055)
@@ -8,5 +8,9 @@
 incs += ' ../../makesrna'
 incs += ' ../../python'
 
+defs = []
 
-env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), [], 
libtype=['core'], priority=[90] )
+if not env['WITH_BF_PYTHON']:
+       defs.append('DISABLE_PYTHON')
+
+env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), defs, 
libtype=['core'], priority=[90] )

Modified: 
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c   
    2008-12-25 14:17:54 UTC (rev 18054)
+++ 
branches/blender2.5/blender/source/blender/editors/space_script/script_edit.c   
    2008-12-25 16:02:35 UTC (rev 18055)
@@ -61,14 +61,13 @@
 
 static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
-       ScrArea *sa= CTX_wm_area(C);
        ARegion *ar= CTX_wm_region(C);
 
        char filename[512];
        RNA_string_get(op->ptr, "filename", filename);
-
+#ifndef DISABLE_PYTHON
        BPY_run_python_script(C, filename);
-
+#endif
        ED_region_tag_redraw(ar);
 
        return OPERATOR_FINISHED;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs