Commit: 084a967ab43fedf91012dd5cec2afb1451d3c7fc Author: Joseph Eagar Date: Mon Dec 20 14:54:25 2021 -0500 Branches: sculpt-dev https://developer.blender.org/rB084a967ab43fedf91012dd5cec2afb1451d3c7fc
Merge branch 'master' into sculpt-dev =================================================================== =================================================================== diff --cc source/blender/editors/sculpt_paint/paint_intern.h index ce827c22034,09013ea00f4..51771f20d71 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@@ -25,7 -25,9 +25,9 @@@ #include "BKE_paint.h" +#include "BLI_rect.h" + #include "BLI_compiler_compat.h" + #include "BLI_math.h" -#include "BLI_rect.h" #include "DNA_scene_types.h" @@@ -493,6 -403,6 +495,7 @@@ bool mask_paint_poll(struct bContext *C bool paint_curve_poll(struct bContext *C); bool facemask_paint_poll(struct bContext *C); ++ /** * Uses symm to selectively flip any axis of a coordinate. */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
