[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22632] branches/blender2.5/blender/source : texture enum was crashing when generating docs, removed radiosity from makefiles.
Campbell Barton
ideasman42 at gmail.com
Wed Aug 19 16:04:21 CEST 2009
Revision: 22632
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22632
Author: campbellbarton
Date: 2009-08-19 16:04:21 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
texture enum was crashing when generating docs, removed radiosity from makefiles.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
branches/blender2.5/blender/source/blender/render/intern/source/Makefile
branches/blender2.5/blender/source/creator/Makefile
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c 2009-08-19 12:35:40 UTC (rev 22631)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c 2009-08-19 14:04:21 UTC (rev 22632)
@@ -142,7 +142,7 @@
EnumPropertyItem *item= NULL;
int totitem= 0;
- if(tex) {
+ if(tex && C) { /* Note, tex/mtex/ntree can be invalid of C is NULL, TODO - can this give valid results when C is NULL? */
bNodeTree *ntree= tex->nodetree;
if(ntree) {
EnumPropertyItem tmp= {0, "", 0, "", ""};
Modified: branches/blender2.5/blender/source/blender/render/intern/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/render/intern/source/Makefile 2009-08-19 12:35:40 UTC (rev 22631)
+++ branches/blender2.5/blender/source/blender/render/intern/source/Makefile 2009-08-19 14:04:21 UTC (rev 22632)
@@ -39,7 +39,6 @@
# The external modules follow after. There should be a nicer way to say this.
CPPFLAGS += -I../include
CPPFLAGS += -I../../extern/include
-CPPFLAGS += -I../../../radiosity/extern/include
CPPFLAGS += -I../../../blenlib
CPPFLAGS += -I../../../imbuf
CPPFLAGS += -I../../../makesdna
Modified: branches/blender2.5/blender/source/creator/Makefile
===================================================================
--- branches/blender2.5/blender/source/creator/Makefile 2009-08-19 12:35:40 UTC (rev 22631)
+++ branches/blender2.5/blender/source/creator/Makefile 2009-08-19 14:04:21 UTC (rev 22632)
@@ -40,7 +40,6 @@
CFLAGS += $(LEVEL_1_C_WARNINGS)
CPPFLAGS += -I../blender/render/extern/include
-CPPFLAGS += -I../blender/radiosity/extern/include
# two needed for the kernel
CPPFLAGS += -I../blender/imbuf
More information about the Bf-blender-cvs
mailing list