[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19333] branches/blender2.5/blender/source : 2.5 compiles again with scons.

[Joshua Leung]

Revision: 19333
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19333
Author:   aligorith
Date:     2009-03-20 04:32:56 +0100 (Fri, 20 Mar 2009)

Log Message:
-----------
2.5 compiles again with scons. Commented out some lines referring to code in the missing file rna_context.c

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
    branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
    branches/blender2.5/blender/source/creator/SConscript

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2009-03-20 02:26:02 UTC (rev 19332)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2009-03-20 03:32:56 UTC (rev 19333)
@@ -1415,7 +1415,7 @@
 	{"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},

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2009-03-20 02:26:02 UTC (rev 19332)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2009-03-20 03:32:56 UTC (rev 19333)
@@ -642,7 +642,7 @@
 	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;
 

Modified: branches/blender2.5/blender/source/creator/SConscript
===================================================================
--- branches/blender2.5/blender/source/creator/SConscript	2009-03-20 02:26:02 UTC (rev 19332)
+++ branches/blender2.5/blender/source/creator/SConscript	2009-03-20 03:32:56 UTC (rev 19333)
@@ -6,7 +6,7 @@
 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']