Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2016-07-25 10:34:49 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2016-07-25 10:34:49 +0300
commite0333d54d4a362dabdde70964c7348ebe9445557 (patch)
treec1eec3e864fcaa96bc7d92d88e717145b103a557 /source/creator
parentc2e2e93152ca49b7911831aed3023d6ce11ef393 (diff)
parentf4cb6d45d50d5fa45bcb78236725924219c9b038 (diff)
Merge branch 'master' into strand_nodes
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/creator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 066b0b0ddb3..a5c7b02b3d9 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -173,9 +173,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