1 files changed, 22 insertions, 20 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index c350cb3b48a..a9334edd39b 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3535,15 +3535,15 @@ static void do_elastic_deform_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, in
 
 static ePaintSymmetryAreas sculpt_get_vertex_symm_area(const float co[3])
 {
-  ePaintSymmetryAreas symm_area = AREA_SYMM_DEFAULT;
+  ePaintSymmetryAreas symm_area = PAINT_SYMM_AREA_DEFAULT;
   if (co[0] < 0.0f) {
-    symm_area |= AREA_SYMM_X;
+    symm_area |= PAINT_SYMM_AREA_X;
   }
   if (co[1] < 0.0f) {
-    symm_area |= AREA_SYMM_Y;
+    symm_area |= PAINT_SYMM_AREA_Y;
   }
   if (co[2] < 0.0f) {
-    symm_area |= AREA_SYMM_Z;
+    symm_area |= PAINT_SYMM_AREA_Z;
   }
   return symm_area;
 }
@@ -3584,9 +3584,9 @@ static void sculpt_flip_quat_by_symm_area(float quat[3],
   }
 }
 
-static void pose_solve_ik_chain(PoseIKChain *ik_chain, const float initial_target[3])
+static void pose_solve_ik_chain(SculptPoseIKChain *ik_chain, const float initial_target[3])
 {
-  PoseIKChainSegment *segments = ik_chain->segments;
+  SculptPoseIKChainSegment *segments = ik_chain->segments;
   int tot_segments = ik_chain->tot_segments;
 
   float target[3];
@@ -3633,9 +3633,11 @@ static void pose_solve_ik_chain(PoseIKChain *ik_chain, const float initial_targe
   }
 }
 
-static void pose_solve_roll_chain(PoseIKChain *ik_chain, const Brush *brush, const float roll)
+static void pose_solve_roll_chain(SculptPoseIKChain *ik_chain,
+                                  const Brush *brush,
+                                  const float roll)
 {
-  PoseIKChainSegment *segments = ik_chain->segments;
+  SculptPoseIKChainSegment *segments = ik_chain->segments;
   int tot_segments = ik_chain->tot_segments;
 
   for (int i = 0; i < tot_segments; i++) {
@@ -3663,8 +3665,8 @@ static void do_pose_brush_task_cb_ex(void *__restrict userdata,
 {
   SculptThreadedTaskData *data = userdata;
   SculptSession *ss = data->ob->sculpt;
-  PoseIKChain *ik_chain = ss->cache->pose_ik_chain;
-  PoseIKChainSegment *segments = ik_chain->segments;
+  SculptPoseIKChain *ik_chain = ss->cache->pose_ik_chain;
+  SculptPoseIKChainSegment *segments = ik_chain->segments;
 
   PBVHVertexIter vd;
   float disp[3], new_co[3];
@@ -3729,7 +3731,7 @@ static void do_pose_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
     return;
   }
 
-  PoseIKChain *ik_chain = ss->cache->pose_ik_chain;
+  SculptPoseIKChain *ik_chain = ss->cache->pose_ik_chain;
 
   /* Solve the positions and rotations of the IK chain. */
   if (ss->cache->invert) {
@@ -4067,7 +4069,7 @@ static void pose_brush_init_task_cb_ex(void *__restrict userdata,
   BKE_pbvh_vertex_iter_end;
 }
 
-void sculpt_pose_ik_chain_free(PoseIKChain *ik_chain)
+void sculpt_pose_ik_chain_free(SculptPoseIKChain *ik_chain)
 {
   for (int i = 0; i < ik_chain->tot_segments; i++) {
     MEM_SAFE_FREE(ik_chain->segments[i].weights);
@@ -4076,12 +4078,12 @@ void sculpt_pose_ik_chain_free(PoseIKChain *ik_chain)
   MEM_SAFE_FREE(ik_chain);
 }
 
-PoseIKChain *sculpt_pose_ik_chain_init(Sculpt *sd,
-                                       Object *ob,
-                                       SculptSession *ss,
-                                       Brush *br,
-                                       const float initial_location[3],
-                                       const float radius)
+SculptPoseIKChain *sculpt_pose_ik_chain_init(Sculpt *sd,
+                                             Object *ob,
+                                             SculptSession *ss,
+                                             Brush *br,
+                                             const float initial_location[3],
+                                             const float radius)
 {
 
   float chain_end[3];
@@ -4105,9 +4107,9 @@ PoseIKChain *sculpt_pose_ik_chain_init(Sculpt *sd,
   pose_factor_grow[nearest_vertex_index] = 1.0f;
 
   /* Init the IK chain with empty weights. */
-  PoseIKChain *ik_chain = MEM_callocN(sizeof(PoseIKChain), "Pose IK Chain");
+  SculptPoseIKChain *ik_chain = MEM_callocN(sizeof(SculptPoseIKChain), "Pose IK Chain");
   ik_chain->tot_segments = br->pose_ik_segments;
-  ik_chain->segments = MEM_callocN(ik_chain->tot_segments * sizeof(PoseIKChainSegment),
+  ik_chain->segments = MEM_callocN(ik_chain->tot_segments * sizeof(SculptPoseIKChainSegment),
                                    "Pose IK Chain Segments");
   for (int i = 0; i < br->pose_ik_segments; i++) {
     ik_chain->segments[i].weights = MEM_callocN(totvert * sizeof(float), "Pose IK weights");