diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-04 06:22:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-04 06:22:56 +0400 |
| commit | dd8e83606776d1d3c51cd8f5c89bf6d1a7e05f74 (patch) | |
| tree | 710d8682910d03d019ca0f4a1cb86fcf2b268c2e /source/creator | |
| parent | 6dfa1601092b9aa4de88420ce1e60371cd6aed69 (diff) | |
| parent | 2f2c0a51a5b108213004dcda3da6defda82e6e41 (diff) | |
Merged changes in the trunk up to revision 51853.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c
This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 682ab5013d6..f986e30b10c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -738,14 +738,6 @@ elseif(APPLE) endif() - #OSL shader_headers needed - if(WITH_CYCLES_OSL) - install( - FILES ${LIBDIR}/osl/shaders/oslutil.h ${LIBDIR}/osl/shaders/stdosl.h - DESTINATION ${TARGETDIR}/blender.app/Contents/shaders/ - ) - endif() - # install blenderplayer bundle - copy of blender.app above. re-using macros et al # note we are using OSX Bundle as base and copying Blender dummy bundle on top of it if(WITH_GAMEENGINE AND WITH_PLAYER) |