diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
| commit | b7cd9ec3ada529bf1d57cf08cc96851ceb67a47d (patch) | |
| tree | 4ec25ec70b30c3e4a18b384e1938e3aec957d264 /source/creator | |
| parent | 6cee7bb2b77bc7b577a3067c30dc56e22b4752ce (diff) | |
| parent | eb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc (diff) | |
Merged changes in the trunk up to revision 52340.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | source/creator/creator.c | 5 |
2 files changed, 7 insertions, 15 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 5da08cf67da..8e86ecbff93 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -619,18 +619,7 @@ elseif(WIN32) install( # x86 builds can run on x64 Windows, so this is required at all times FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll DESTINATION ${TARGETDIR} - ) - - if(WITH_OPENIMAGEIO) - if(NOT MINGW) - set(OIIOBIN ${LIBDIR}/openimageio) - install( - FILES - ${OIIOBIN}/bin/OpenImageIO.dll - DESTINATION ${TARGETDIR} - ) - endif() - endif() + ) if(WITH_OPENCOLORIO) set(OCIOBIN ${LIBDIR}/opencolorio/bin) @@ -668,7 +657,7 @@ elseif(APPLE) ) endmacro() - set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) + set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app) # setup Info.plist execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -727,7 +716,7 @@ elseif(APPLE) # 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) - set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app) set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist) set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION}) diff --git a/source/creator/creator.c b/source/creator/creator.c index 99f56d0c0ec..26162051147 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1079,7 +1079,9 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) "\n\t\t-p <sx> <sy>\tOpen with lower left corner at <sx>, <sy>" "\n\t\t-m\t\tRead from disk (Don't buffer)" "\n\t\t-f <fps> <fps-base>\t\tSpecify FPS to start with" - "\n\t\t-j <frame>\tSet frame step to <frame>"; + "\n\t\t-j <frame>\tSet frame step to <frame>" + "\n\t\t-s <frame>\tPlay from <frame>" + "\n\t\t-j <frame>\tPlay until <frame>"; static char game_doc[] = "Game Engine specific options" "\n\t-g fixedtime\t\tRun on 50 hertz without dropping frames" @@ -1272,6 +1274,7 @@ int main(int argc, const char **argv) initglobals(); /* blender.c */ IMB_init(); + BKE_images_init(); #ifdef WITH_FFMPEG IMB_ffmpeg_init(); |