diff options
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/Makefile | 1 | ||||
| -rw-r--r-- | source/creator/Makefile | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index b7403ab1178..f82edee8ff1 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -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, "", ""}; diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile index 3c8d0f637a3..5d4a224002e 100644 --- a/source/blender/render/intern/source/Makefile +++ b/source/blender/render/intern/source/Makefile @@ -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 diff --git a/source/creator/Makefile b/source/creator/Makefile index fbe5d252a77..592cf913dfa 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -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 |