Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 51853.

Browse Source 
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!
This commit is contained in:
Tamito Kajiyama
2012-11-04 02:22:56 +00:00
parent 6dfa160109 2f2c0a51a5
commit dd8e836067
401 changed files with 5843 additions and 3351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/creator/CMakeLists.txt
View File

@@ -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)