Commit: 909d4971071b669f92f549bd671795f85746bdbd Author: Hans Goudey Date: Tue Apr 21 17:27:15 2020 -0500 Branches: modifier-panels-ui https://developer.blender.org/rB909d4971071b669f92f549bd671795f85746bdbd
Merge branch 'master' into modifier-panels-ui =================================================================== =================================================================== diff --cc source/blender/modifiers/intern/MOD_mask.cc index de9ba9134c8,1f9017b4b18..948742fd36e --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@@ -60,11 -45,10 +60,11 @@@ #include "DEG_depsgraph_query.h" #include "MOD_modifiertypes.h" +#include "MOD_ui_common.h" - #include "BLI_array_cxx.h" - #include "BLI_listbase_wrapper.h" - #include "BLI_vector.h" + #include "BLI_array.hh" + #include "BLI_listbase_wrapper.hh" + #include "BLI_vector.hh" using BLI::Array; using BLI::ArrayRef; _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
