kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Making blender compile with Makefiles if WITH_OPENEXR is false.

Browse Source
This commit is contained in:
Chris Want 2006-02-21 21:24:06 +00:00
parent 957832ecf1
commit 96a21d5924
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/Makefile
View File

@ -67,3 +67,7 @@ endif
ifeq ($(WITH_FFMPEG),true)
CPPFLAGS += -DWITH_FFMPEG
endif
ifeq ($(WITH_OPENEXR),true)
CPPFLAGS += -DWITH_OPENEXR
endif

4
source/blender/render/intern/source/pipeline.c
View File

@ -366,6 +366,7 @@ static void merge_render_result(RenderResult *rr, RenderResult *rrpart)
static void save_render_result_tile(Render *re, RenderPart *pa)
{
#ifdef WITH_OPENEXR
RenderResult *rrpart= pa->result;
RenderLayer *rlp;
int offs, partx, party;
@ -392,6 +393,7 @@ static void save_render_result_tile(Render *re, RenderPart *pa)
imb_exrtile_write_channels(exrhandle, partx, party);
}
}
#endif
}
@ -1187,8 +1189,10 @@ void RE_BlenderFrame(Render *re, Scene *scene, int frame)
if(render_initialize_from_scene(re, scene)) {
do_render_final(re);
#ifdef WITH_OPENEXR
if(exrhandle)
imb_exrtile_close(exrhandle);
#endif
exrhandle= NULL;
}
}