diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 11:56:06 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 11:56:06 +0300 |
| commit | cdebd68ff9aa12abf0958882fcb9eba437833a2c (patch) | |
| tree | 18b09acc2c211726cdcc46b5c42609121197d2a7 /build_files | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
| parent | 087c82e392bc4cd175421fc5bc5faa88d218c224 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/idcode.c
source/blender/editors/interface/interface_templates.c
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenImageIO.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 5e454b6e5cd..789097dfd51 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -59,7 +59,8 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY FIND_FILE(OPENIMAGEIO_IDIFF NAMES idiff - ${OPENIMAGEIO_ROOT_DIR} + HINTS + ${OPENIMAGEIO_ROOT_DIR} PATH_SUFFIXES bin ) |