diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 22:54:57 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 22:54:57 +0400 |
commit | 83a44e48e7cb5cc6c794b50bb168a21144baeb06 (patch) | |
tree | 549504aa10e5c25cb06bdebeb16316f191d31c9e /source/blender | |
parent | 586c631c88d7a4ea24810bf18ab96ed7ec542d37 (diff) |
Cycles: some code changes to sync with trunk.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 12 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/SConscript | 2 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c (renamed from source/blender/render/intern/pipeline/engine.c) | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 |
6 files changed, 17 insertions, 7 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index c4872f370e5..f5e2bf71468 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -169,27 +169,39 @@ typedef struct ImBuf { #define JPG (1 << 27) #define BMP (1 << 26) +#ifdef WITH_QUICKTIME #define QUICKTIME (1 << 25) +#endif +#ifdef WITH_HDR #define RADHDR (1 << 24) +#endif +#ifdef WITH_TIFF #define TIF (1 << 23) #define TIF_16BIT (1 << 8 ) +#endif #define OPENEXR (1 << 22) #define OPENEXR_HALF (1 << 8 ) #define OPENEXR_COMPRESS (7) +#ifdef WITH_CINEON #define CINEON (1 << 21) #define DPX (1 << 20) +#endif +#ifdef WITH_DDS #define DDS (1 << 19) +#endif +#ifdef WITH_OPENJPEG #define JP2 (1 << 18) #define JP2_12BIT (1 << 17) #define JP2_16BIT (1 << 16) #define JP2_YCC (1 << 15) #define JP2_CINE (1 << 14) #define JP2_CINE_48FPS (1 << 13) +#endif #define RAWTGA (TGA | 1) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index f866e83c68e..d5b3bd5e311 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -56,6 +56,7 @@ set(SRC intern/raytrace/rayobject_vbvh.cpp intern/source/convertblender.c intern/source/envmap.c + intern/source/external_engine.c intern/source/gammaCorrectionTables.c intern/source/imagetexture.c intern/source/initrender.c @@ -78,7 +79,6 @@ set(SRC intern/source/volumetric.c intern/source/voxeldata.c intern/source/zbuf.c - intern/pipeline/engine.c extern/include/RE_engine.h extern/include/RE_pipeline.h diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 1e19c6436b7..9c724187c27 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -1,7 +1,7 @@ #!/usr/bin/python Import ('env') -sources = env.Glob('intern/source/*.c') + env.Glob('intern/pipeline/*.c') +sources = env.Glob('intern/source/*.c') raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 7d5ba28cfa6..3df784a4e62 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -35,9 +35,9 @@ #define RE_ENGINE_H #include "DNA_listBase.h" -#include "DNA_vec_types.h" #include "RNA_types.h" +struct Object; struct Render; struct RenderEngine; struct RenderEngineType; diff --git a/source/blender/render/intern/pipeline/engine.c b/source/blender/render/intern/source/external_engine.c index d67cd3cb88f..2c8023afce0 100644 --- a/source/blender/render/intern/pipeline/engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -47,8 +47,6 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "intern/openexr/openexr_multi.h" - #ifdef WITH_PYTHON #include "BPY_extern.h" #endif diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 864707d7060..567e1934f97 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -965,7 +965,7 @@ static void renderresult_add_names(RenderResult *rr) } /* called for reading temp files, and for external engines */ -static int read_render_result_from_file(const char *filename, RenderResult *rr, int external) +static int read_render_result_from_file(const char *filename, RenderResult *rr) { RenderLayer *rl; RenderPass *rpass; @@ -1029,7 +1029,7 @@ static int read_render_result(Render *re, int sample) render_unique_exr_name(re, str, sample); printf("read exr tmp file: %s\n", str); - if(read_render_result_from_file(str, re->result, 0)) { + if(read_render_result_from_file(str, re->result)) { success= TRUE; } else { |