Commit: e547026dfe36aee5243e83741c58d5262bf2aae5 Author: Julian Eisel Date: Thu Jun 6 10:56:19 2019 +0200 Branches: soc-2019-openxr https://developer.blender.org/rBe547026dfe36aee5243e83741c58d5262bf2aae5
Merge branch 'master' into soc-2019-openxr =================================================================== =================================================================== diff --cc source/blender/windowmanager/intern/wm_init_exit.c index ad3bdc687b3,7e54afcb9aa..0a158f36f1c --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@@ -123,9 -125,8 +125,10 @@@ #include "COM_compositor.h" #include "DEG_depsgraph.h" + #include "DEG_depsgraph_query.h" +#include "wm.h" + #include "DRW_engine.h" #ifdef WITH_OPENSUBDIV _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
