diff options
author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-10-12 13:12:10 +0300 |
---|---|---|
committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-10-12 13:12:10 +0300 |
commit | a8e894951a0b54d7cffd90b347ca64cb0789fe43 (patch) | |
tree | 553fa0fe2a2a1545672fde49ac17e05e4c2880ea /source/blender/windowmanager/intern/wm_files.c | |
parent | 7a89fa4a8550a7b3020bd762ab8b69ec836e2f6b (diff) | |
parent | b618c185cb7c5930980e459c84b8818a0fba1f1d (diff) |
Merge branch 'master' of git.blender.org:blender into cycles_embree
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 477699fccaa..796103677bf 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -641,7 +641,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) struct { char app_template[64]; bool override; -} wm_init_state_app_template = {0}; +} wm_init_state_app_template = {{0}}; /** * Used for setting app-template from the command line: @@ -964,7 +964,7 @@ static RecentFile *wm_file_history_find(const char *filepath) /** * Write #BLENDER_HISTORY_FILE as-is, without checking the environment - * (thats handled by #wm_history_file_update). + * (that's handled by #wm_history_file_update). */ static void wm_history_file_write(void) { |