Commit: 2d20d11b013bfa930a19857a1cafd14f285f844c Author: Hans Goudey Date: Tue Mar 31 12:11:29 2020 -0500 Branches: modifier-panels-ui https://developer.blender.org/rB2d20d11b013bfa930a19857a1cafd14f285f844c
Merge branch 'master' into modifier-panels-ui =================================================================== =================================================================== diff --cc source/blender/modifiers/intern/MOD_remesh.c index 3c99f3d027d,2fa8dc973a1..44fa3f90cd4 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@@ -32,20 -30,12 +32,21 @@@ #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" +#include "DNA_screen_types.h" -#include "MOD_modifiertypes.h" - +#include "BKE_context.h" #include "BKE_mesh.h" + #include "BKE_mesh_remesh_voxel.h" #include "BKE_mesh_runtime.h" +#include "BKE_screen.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + +#include "MOD_modifiertypes.h" +#include "MOD_ui_common.h" #include <assert.h> #include <stdlib.h> _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
