diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 16:48:13 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 16:48:13 +0400 |
| commit | 2d3795ab3c5b107702012b21354174da2ca00e33 (patch) | |
| tree | 3940a0ed198699fa9fc75220464e155d463f1f97 /source/creator | |
| parent | 34a22b3b78b6c577fdb048751f58cce89f68a2d9 (diff) | |
| parent | 81946b9138201800e495eb28addf254958feb1a4 (diff) | |
merge from trunk r37405
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4bb0437ed6f..d089e7e98ba 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -876,6 +876,12 @@ endif() message(STATUS "Blender Skipping: (${REM_MSG})") endif() target_link_libraries(blender ${BLENDER_SORTED_LIBS}) + + unset(SEARCHLIB) + unset(SORTLIB) + unset(REMLIB) + unset(REM_MSG) + #else() # target_link_libraries(blender ${BLENDER_LINK_LIBS}) #endif() diff --git a/source/creator/creator.c b/source/creator/creator.c index 6e9ecf234fc..2a963db1746 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -538,7 +538,7 @@ static int set_output(int argc, const char **argv, void *data) if (argc >= 1){ if (CTX_data_scene(C)) { Scene *scene= CTX_data_scene(C); - BLI_strncpy(scene->r.pic, argv[1], FILE_MAXDIR); + BLI_strncpy(scene->r.pic, argv[1], sizeof(scene->r.pic)); } else { printf("\nError: no blend loaded. cannot use '-o / --render-output'.\n"); } |