From bcddeaa6999b144f94c5724a98105903e817c59b Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 20 Mar 2009 03:32:56 +0000 Subject: 2.5 compiles again with scons. Commented out some lines referring to code in the missing file rna_context.c --- source/blender/makesrna/intern/makesrna.c | 2 +- source/blender/python/intern/bpy_rna.c | 2 +- source/creator/SConscript | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 76f045464dd..f2fa538439f 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -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}, diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 6215ab86500..ca65eee0c6f 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -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; diff --git a/source/creator/SConscript b/source/creator/SConscript index 6c36a8f5b41..27cfc161c42 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -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'] -- cgit v1.2.3