diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt_intern.h')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_intern.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index d8e29d0e773..1c22b4e40c1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -102,7 +102,7 @@ void SCULPT_vertex_neighbors_get(struct SculptSession *ss, SculptVertexNeighborIter *iter); /* Iterator over neighboring vertices. */ -#define sculpt_vertex_neighbors_iter_begin(ss, v_index, neighbor_iterator) \ +#define SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN(ss, v_index, neighbor_iterator) \ SCULPT_vertex_neighbors_get(ss, v_index, false, &neighbor_iterator); \ for (neighbor_iterator.i = 0; neighbor_iterator.i < neighbor_iterator.size; \ neighbor_iterator.i++) { \ @@ -110,7 +110,7 @@ void SCULPT_vertex_neighbors_get(struct SculptSession *ss, /* Iterate over neighboring and duplicate vertices (for PBVH_GRIDS). Duplicates come * first since they are nearest for floodfill. */ -#define sculpt_vertex_duplicates_and_neighbors_iter_begin(ss, v_index, neighbor_iterator) \ +#define SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN(ss, v_index, neighbor_iterator) \ SCULPT_vertex_neighbors_get(ss, v_index, true, &neighbor_iterator); \ for (neighbor_iterator.i = neighbor_iterator.size - 1; neighbor_iterator.i >= 0; \ neighbor_iterator.i--) { \ @@ -118,7 +118,7 @@ void SCULPT_vertex_neighbors_get(struct SculptSession *ss, neighbor_iterator.is_duplicate = (ni.i >= \ neighbor_iterator.size - neighbor_iterator.num_duplicates); -#define sculpt_vertex_neighbors_iter_end(neighbor_iterator) \ +#define SCULPT_VERTEX_NEIGHBORS_ITER_END(neighbor_iterator) \ } \ if (neighbor_iterator.neighbors != neighbor_iterator.neighbors_fixed) { \ MEM_freeN(neighbor_iterator.neighbors); \ @@ -517,7 +517,7 @@ bool SCULPT_pbvh_calc_area_normal(const struct Brush *brush, * For descriptions of these settings, check the operator properties. */ -#define CLAY_STABILIZER_LEN 10 +#define SCULPT_CLAY_STABILIZER_LEN 10 typedef struct StrokeCache { /* Invariants */ @@ -608,7 +608,7 @@ typedef struct StrokeCache { /* Angle of the front tilting plane of the brush to simulate clay accumulation. */ float clay_thumb_front_angle; /* Stores pressure samples to get an stabilized strength and radius variation. */ - float clay_pressure_stabilizer[CLAY_STABILIZER_LEN]; + float clay_pressure_stabilizer[SCULPT_CLAY_STABILIZER_LEN]; int clay_pressure_stabilizer_index; /* Cloth brush */ |