[Bf-blender-cvs] [0ff6eb86815] greasepencil-object: GPencil: Fix old merge error
Antonioya
noreply at git.blender.org
Fri Aug 9 12:45:00 CEST 2019
Commit: 0ff6eb868153bd77192ed6deee4492f75c9ba032
Author: Antonioya
Date: Fri Aug 9 12:38:59 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0ff6eb868153bd77192ed6deee4492f75c9ba032
GPencil: Fix old merge error
===================================================================
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 900024d4853..29cb02888ac 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -80,6 +80,8 @@
#include "RE_engine.h"
#include "RE_pipeline.h" /* RE_ free stuff */
+#include "IMB_thumbs.h"
+
#ifdef WITH_PYTHON
# include "BPY_extern.h"
#endif
@@ -299,6 +301,9 @@ void WM_init(bContext *C, int argc, const char **argv)
/* Call again to set from userpreferences... */
BLT_lang_set(NULL);
+ /* That one is generated on demand, we need to be sure it's clear on init. */
+ IMB_thumb_clear_translations();
+
if (!G.background) {
#ifdef WITH_INPUT_NDOF
More information about the Bf-blender-cvs
mailing list