diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 22:15:46 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 22:15:46 +0400 |
| commit | 12f0795d498d4143af5a3203efad07589312300d (patch) | |
| tree | 1638bd9c509270db9f1e4d54aac469fbb35d5e69 /source/creator | |
| parent | 2d3795ab3c5b107702012b21354174da2ca00e33 (diff) | |
| parent | 81946b9138201800e495eb28addf254958feb1a4 (diff) | |
accident when merge. revert to 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, 1 insertions, 7 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d089e7e98ba..4bb0437ed6f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -876,12 +876,6 @@ 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 2a963db1746..6e9ecf234fc 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], sizeof(scene->r.pic)); + BLI_strncpy(scene->r.pic, argv[1], FILE_MAXDIR); } else { printf("\nError: no blend loaded. cannot use '-o / --render-output'.\n"); } |