diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2012-01-08 01:16:15 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2012-01-08 01:16:15 +0400 |
| commit | da84f3d4c94cb539f2ed80c8ec57602c05b95560 (patch) | |
| tree | acf155a2ba17b06812fbee7d0b82d8ceca954ce7 /source/blender | |
| parent | cce23a732a2e92393a226e3be2cc3282db8cadb2 (diff) | |
Fix build break with double-definition of EXR stubs
A better solution would be to mark all function in openexr_multi.h as forceinline or static, but this change just fixes it to work for the reason trunk works: the header defining the stubs is only needs to be included in one .c file
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index f82287e8645..2add53a86a6 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -72,8 +72,6 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "intern/openexr/openexr_multi.h" - #include "RE_engine.h" #include "RE_pipeline.h" |