diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
| commit | 816377cc02fe5dd4be945c0f3d415861114b4980 (patch) | |
| tree | 306e9d1363aa66bc919e43b80b3380fab9f60ea9 /source/blender/imbuf/intern/openexr/openexr_api.cpp | |
| parent | c8af263e5d8d9d41a757e8438cdcf3b64d57e0c0 (diff) | |
| parent | ee768ada680ce0a8aa184c882005c0ef1c0140fb (diff) | |
Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas
Diffstat (limited to 'source/blender/imbuf/intern/openexr/openexr_api.cpp')
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index a780727b1a2..32d97d79bd7 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -51,6 +51,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) #include "IMB_imbuf.h" #include "IMB_allocimbuf.h" +#define WITH_OPENEXR #include "openexr_multi.h" } |