diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
commit | b1532493c27b08444745cef348641f3a0e899ba8 (patch) | |
tree | 84db57081ef3e1d2a1bfbf3c4bbfe352854164f2 /source/creator | |
parent | 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a (diff) | |
parent | e7721f5ec8b859d14c982a8a34bc269ab7eed82b (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/creator/creator.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d8435284096..7acea43d1f5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -246,7 +246,7 @@ if(WITH_PYTHON_MODULE) set_target_properties( blender PROPERTIES - MACOSX_BUNDLE + MACOSX_BUNDLE TRUE LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}" LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}" ) diff --git a/source/creator/creator.c b/source/creator/creator.c index 85c4e5b0681..ccb3e02e0a9 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -170,9 +170,9 @@ static void callback_main_atexit(void *user_data) #ifdef WIN32 if (app_init_data->argv) { while (app_init_data->argv_num) { - free(app_init_data->argv[--app_init_data->argv_num]); + free((void *)app_init_data->argv[--app_init_data->argv_num]); } - free(app_init_data->argv); + free((void *)app_init_data->argv); app_init_data->argv = NULL; } #endif |