texture enum was crashing when generating docs, removed radiosity from makefiles.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Aug 2009 14:04:21 +0000 (14:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Aug 2009 14:04:21 +0000 (14:04 +0000)
source/blender/makesrna/intern/rna_texture.c
source/blender/render/intern/source/Makefile
source/creator/Makefile

index b7403ab1178eb11b1dd2edb1d69e33234a93d838..f82edee8ff19b00a8d1b1f3d1852a50bf3ddcce1 100644 (file)
@@ -142,7 +142,7 @@ static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerR
        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, "", ""};
index 3c8d0f637a386471c88676a6ca858900d9cda076..5d4a224002e596efadec5b38772da5927a0e7fb3 100644 (file)
@@ -39,7 +39,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
 # 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
index fbe5d252a773cde1f1cd0ad72dd749e85aa45ce2..592cf913dfa3e4bc2dfc979f673a912b2dbc202f 100644 (file)
@@ -40,7 +40,6 @@ include nan_compile.mk
 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