diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-18 15:44:00 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-18 15:44:00 +0400 |
commit | c5860e6c5d0e08b3d918aadceab0c017790636ff (patch) | |
tree | ab199d8c73f66dd653372be2fb0948314a4f3991 /source/blender/editors/sculpt_paint/sculpt.c | |
parent | bb8bbc817e5746302f556ae316c0bdc40440c6a8 (diff) |
Rename 'clay tubes' to 'clay strips' and include it in the capabilities RNA.
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index a8a96b5aa8d..9909c8b4302 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -563,7 +563,7 @@ static float brush_strength(Sculpt *sd, StrokeCache *cache, float feather) switch(brush->sculpt_tool){ case SCULPT_TOOL_CLAY: - case SCULPT_TOOL_CLAY_TUBES: + case SCULPT_TOOL_CLAY_STRIPS: case SCULPT_TOOL_DRAW: case SCULPT_TOOL_LAYER: return alpha * flip * pressure * overlap * feather; @@ -2026,7 +2026,7 @@ static void do_clay_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) } } -static void do_clay_tubes_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) +static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode) { SculptSession *ss = ob->sculpt; Brush *brush = paint_brush(&sd->paint); @@ -2370,8 +2370,8 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush) case SCULPT_TOOL_CLAY: do_clay_brush(sd, ob, nodes, totnode); break; - case SCULPT_TOOL_CLAY_TUBES: - do_clay_tubes_brush(sd, ob, nodes, totnode); + case SCULPT_TOOL_CLAY_STRIPS: + do_clay_strips_brush(sd, ob, nodes, totnode); break; case SCULPT_TOOL_FILL: do_fill_brush(sd, ob, nodes, totnode); @@ -2763,8 +2763,8 @@ static const char *sculpt_tool_name(Sculpt *sd) return "Flatten Brush"; break; case SCULPT_TOOL_CLAY: return "Clay Brush"; break; - case SCULPT_TOOL_CLAY_TUBES: - return "Clay Tubes Brush"; break; + case SCULPT_TOOL_CLAY_STRIPS: + return "Clay Strips Brush"; break; case SCULPT_TOOL_FILL: return "Fill Brush"; break; case SCULPT_TOOL_SCRAPE: @@ -2916,7 +2916,7 @@ static void sculpt_update_cache_invariants(bContext* C, Sculpt *sd, SculptSessio if(ELEM8(brush->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_CREASE, SCULPT_TOOL_BLOB, SCULPT_TOOL_LAYER, SCULPT_TOOL_INFLATE, SCULPT_TOOL_CLAY, - SCULPT_TOOL_CLAY_TUBES, SCULPT_TOOL_ROTATE)) + SCULPT_TOOL_CLAY_STRIPS, SCULPT_TOOL_ROTATE)) if(!(brush->flag & BRUSH_ACCUMULATE)) cache->original = 1; @@ -2935,7 +2935,7 @@ static void sculpt_update_brush_delta(Sculpt *sd, Object *ob, Brush *brush) if(ELEM5(tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_NUDGE, - SCULPT_TOOL_CLAY_TUBES, SCULPT_TOOL_SNAKE_HOOK, + SCULPT_TOOL_CLAY_STRIPS, SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)) { float grab_location[3], imat[4][4], delta[3], loc[3]; @@ -2962,7 +2962,7 @@ static void sculpt_update_brush_delta(Sculpt *sd, Object *ob, Brush *brush) mul_mat3_m4_v3(imat, delta); add_v3_v3(cache->grab_delta, delta); break; - case SCULPT_TOOL_CLAY_TUBES: + case SCULPT_TOOL_CLAY_STRIPS: case SCULPT_TOOL_NUDGE: sub_v3_v3v3(cache->grab_delta, grab_location, cache->old_grab_location); invert_m4_m4(imat, ob->obmat); |