Merge branch 'master' into temp-sculpt-brush-channel

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 95e04b41653..38bf30a773c 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -18,7 +18,9 @@ extern "C" {
 struct Brush;
 struct ImBuf;
 struct ImagePool;
+struct Object;
 struct Main;
+struct MTex;
 struct Scene;
 struct ToolSettings;
 struct UnifiedPaintSettings;
@@ -113,6 +115,7 @@ float BKE_brush_curve_strength_ex(int curve_preset,
  */
 float BKE_brush_sample_tex_3d(const struct Scene *scene,
                               const struct Brush *br,
+                              const struct MTex *mtex,
                               const float point[3],
                               float rgba[4],
                               int thread,
@@ -124,6 +127,24 @@ float BKE_brush_sample_masktex(const struct Scene *scene,
                                struct ImagePool *pool);
 
 /**
+ * Get the mask texture for this given object mode.
+ *
+ * This is preferred above using mtex/mask_mtex attributes directly as due to legacy these
+ * attributes got switched in sculpt mode. 
+ */
+const struct MTex *BKE_brush_mask_texture_get(const struct Brush *brush,
+                                              const eObjectMode object_mode);
+
+/**
+ * Get the color texture for this given object mode.
+ *
+ * This is preferred above using mtex/mask_mtex attributes directly as due to legacy these
+ * attributes got switched in sculpt mode.
+ */
+const struct MTex *BKE_brush_color_texture_get(const struct Brush *brush,
+                                               const eObjectMode object_mode);
+
+/**
  * Radial control.
  */
 struct ImBuf *BKE_brush_gen_radial_control_imbuf(struct Brush *br,