[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26217] trunk/blender/source/blender: support for compiling blender without python working again ( with cmake at least)

[Campbell Barton]

Revision: 26217
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26217
Author:   campbellbarton
Date:     2010-01-23 21:43:55 +0100 (Sat, 23 Jan 2010)

Log Message:
-----------
support for compiling blender without python working again (with cmake at least)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/context.c
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c    2010-01-23 
18:51:56 UTC (rev 26216)
+++ trunk/blender/source/blender/blenkernel/intern/context.c    2010-01-23 
20:43:55 UTC (rev 26217)
@@ -46,7 +46,9 @@
 #include "BKE_screen.h"
 #include "BKE_global.h"
 
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 #include <string.h>
 
@@ -413,13 +415,13 @@
        int ret= 0;
 
        memset(result, 0, sizeof(bContextDataResult));
-
+#ifndef DISABLE_PYTHON
        if(CTX_py_dict_get(C)) {
                return BPY_context_get(C, member, result);
 //             if (BPY_context_get(C, member, result))
 //                     return 1;
        }
-
+#endif
        /* we check recursion to ensure that we do not get infinite
         * loops requesting data from ourselfs in a context callback */
 

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-01-23 
18:51:56 UTC (rev 26216)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-01-23 
20:43:55 UTC (rev 26217)
@@ -42,6 +42,12 @@
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna 
../../blenkernel ../../blenlib ../../ikplugin ../../windowmanager 
../../editors/include ../../imbuf ../../render/extern/include .)
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
+IF(WITH_PYTHON)
+
+ELSE(WITH_PYTHON)
+       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
 IF(WIN32)
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c       2010-01-23 
18:51:56 UTC (rev 26216)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c       2010-01-23 
20:43:55 UTC (rev 26217)
@@ -698,6 +698,7 @@
        RNA_parameter_list_free(&list);
 }
 
+#ifndef DISABLE_PYTHON
 void operator_wrapper(wmOperatorType *ot, void *userdata);
 void macro_wrapper(wmOperatorType *ot, void *userdata);
 
@@ -836,6 +837,7 @@
 
        return dummyot.ext.srna;
 }
+#endif
 
 static StructRNA* rna_Operator_refine(PointerRNA *opr)
 {
@@ -860,7 +862,9 @@
        RNA_def_struct_ui_text(srna, "Operator", "Storage of an operator being 
executed, or registered after execution.");
        RNA_def_struct_sdna(srna, "wmOperator");
        RNA_def_struct_refine_func(srna, "rna_Operator_refine");
+#ifndef DISABLE_PYTHON
        RNA_def_struct_register_funcs(srna, "rna_Operator_register", 
"rna_Operator_unregister");
+#endif
 
        prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -918,8 +922,10 @@
        RNA_def_struct_ui_text(srna, "Macro Operator", "Storage of a macro 
operator being executed, or registered after execution.");
        RNA_def_struct_sdna(srna, "wmOperator");
        RNA_def_struct_refine_func(srna, "rna_MacroOperator_refine");
+#ifndef DISABLE_PYTHON
        RNA_def_struct_register_funcs(srna, "rna_MacroOperator_register", 
"rna_Operator_unregister");
-
+#endif
+    
        prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_string_funcs(prop, "rna_Operator_name_get", 
"rna_Operator_name_length", NULL);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2010-01-23 18:51:56 UTC (rev 26216)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2010-01-23 20:43:55 UTC (rev 26217)
@@ -284,9 +284,10 @@
 //             refresh_interface_font();
 
                CTX_wm_window_set(C, NULL); /* exits queues */
-
+#ifndef DISABLE_PYTHON
                /* run any texts that were loaded in and flagged as modules */
                BPY_load_user_modules(C);
+#endif
        }
        else if(retval==1)
                BKE_write_undo(C, "Import file");


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