2.5 compiles again with scons. Commented out some lines referring to code in the...
authorJoshua Leung <aligorith@gmail.com>
Fri, 20 Mar 2009 03:32:56 +0000 (03:32 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 20 Mar 2009 03:32:56 +0000 (03:32 +0000)
source/blender/makesrna/intern/makesrna.c
source/blender/python/intern/bpy_rna.c
source/creator/SConscript

index 76f0454..f2fa538 100644 (file)
@@ -1415,7 +1415,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_cloth.c", RNA_def_cloth},
        {"rna_color.c", RNA_def_color},
        {"rna_constraint.c", RNA_def_constraint},
-       {"rna_context.c", RNA_def_context},
+       //XXX MISSING FILE! {"rna_context.c", RNA_def_context},
        {"rna_controller.c", RNA_def_controller},
        {"rna_curve.c", RNA_def_curve},
        {"rna_fluidsim.c", RNA_def_fluidsim},
index 6215ab8..ca65eee 100644 (file)
@@ -642,7 +642,7 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA * self, PyObject *pyname )
        if (prop) {
                ret = pyrna_prop_to_py(&self->ptr, prop);
        }
-       else if (self->ptr.type == &RNA_Context) {
+       else if (/*self->ptr.type == &RNA_Context*/0) {
                PointerRNA newptr;
                ListBase newlb;
 
index 6c36a8f..27cfc16 100644 (file)
@@ -6,7 +6,7 @@ sources = 'creator.c'
 incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
 incs += ' ../blender/editors/include ../blender/blenloader ../blender/imbuf'
 incs += ' ../blender/renderconverter ../blender/render/extern/include ../blender/windowmanager'
-incs += ' ../blender/makesdna ../kernel/gen_messaging'
+incs += ' ../blender/makesdna ../blender/makesrna ../kernel/gen_messaging'
 incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
 incs += ' ' + env['BF_OPENGL_INC']