diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-02-08 12:21:41 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-02-08 12:21:41 +0300 |
| commit | f232d7a5995455389a6476043e73879045c34605 (patch) | |
| tree | 5df0fafc2577b9bda39cc5dc07c6709c6ac5d9ed /source/creator | |
| parent | 843e0d1f3ac1724b83bd284a5303236155869ea5 (diff) | |
| parent | d8163a08fb62903257878ae1bdbb3c0ba5b8e773 (diff) | |
Merge branch 'master' into object_nodes
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 29f2834e68f..8082c06d0b7 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -131,7 +131,7 @@ if(WIN32 AND NOT UNIX) list(APPEND SRC - ../icons/winblender.rc + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc ) endif() @@ -982,7 +982,7 @@ elseif(APPLE) # copy site-packages files install_dir( ${LIBDIR}/release/site-packages - ${CMAKE_CURRENT_BINARY_DIR}/python/lib/python${PYTHON_VERSION}/site-packages + ${CMAKE_CURRENT_BINARY_DIR}/python/lib/python${PYTHON_VERSION} ) install(DIRECTORY ${LIBDIR}/python/bin @@ -1095,7 +1095,7 @@ setup_liblinks(blender) if(WIN32 AND NOT WITH_PYTHON_MODULE) set(LAUNCHER_SRC creator_launch_win.c - ../icons/winblender.rc + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc ) add_executable(blender-launcher ${LAUNCHER_SRC}) target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS}) diff --git a/source/creator/creator.c b/source/creator/creator.c index 2a90b235cf2..6cb27029902 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1934,7 +1934,7 @@ int main( DAG_init(); BKE_brush_system_init(); - RE_init_texture_rng(); + RE_texture_rng_init(); BLI_callback_global_init(); |