Commit: 1035184c15ced8cc05f8c378cc55e047d54882e0 Author: Hans Goudey Date: Tue Apr 14 15:36:03 2020 -0500 Branches: modifier-panels-ui https://developer.blender.org/rB1035184c15ced8cc05f8c378cc55e047d54882e0
Merge branch 'master' into modifier-panels-ui =================================================================== =================================================================== diff --cc source/blender/modifiers/intern/MOD_weightvgedit.c index 1fee6797bb5,006191e29fc..86206c4fb81 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@@ -55,7 -45,7 +55,8 @@@ #include "MEM_guardedalloc.h" #include "MOD_modifiertypes.h" +#include "MOD_ui_common.h" + #include "MOD_util.h" #include "MOD_weightvg_util.h" /************************************** diff --cc source/blender/modifiers/intern/MOD_weightvgmix.c index 1081c0bb5fa,f256045f53a..3ca29bcc01a --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@@ -53,7 -43,7 +53,8 @@@ #include "MEM_guardedalloc.h" #include "MOD_modifiertypes.h" +#include "MOD_ui_common.h" + #include "MOD_util.h" #include "MOD_weightvg_util.h" /** _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
