Replace MFace with looptri for dynamicpaint

D1429 by @lichtwerk, with edits

2 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index 9d8a1a66771..6e1f128b7a5 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -56,9 +56,9 @@ void antialias_tagbuf(int xsize, int ysize, char *rectmove);
 /* dynamicpaint.c */
 struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene);
 void RE_free_sample_material(struct Material *mat);
-void RE_sample_material_color(struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
-                              int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob);
-
+void RE_sample_material_color(
+        struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
+        int tri_index, struct DerivedMesh *orcoDm, struct Object *ob);
 /* pointdensity.c */
 
 struct PointDensity;
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index c53fb7d1153..f78c0aa8cb2 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -86,12 +86,12 @@ struct ShadeInputCopy {
 
 typedef struct ShadeInputUV {
 	float dxuv[3], dyuv[3], uv[3];
-	char *name;
+	const char *name;
 } ShadeInputUV;
 
 typedef struct ShadeInputCol {
 	float col[4];
-	char *name;
+	const char *name;
 } ShadeInputCol;
 
 /* localized renderloop data */