diff options
| author | Pablo Dobarro <pablodp606@gmail.com> | 2020-01-24 20:23:28 +0300 |
|---|---|---|
| committer | Pablo Dobarro <pablodp606@gmail.com> | 2020-01-24 20:23:28 +0300 |
| commit | dada30f5efc299c5543d996f7f492bb1e975c0f5 (patch) | |
| tree | 276e16ab330eb533cc06a4887a9c1b3eeee4d6a4 /source/blender/makesdna | |
| parent | f08f92a04dac7213d7f55eb1e5d6d245ae522f03 (diff) | |
| parent | 300f937aec5d0be7b6003a5e835cd2a33bd52d64 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index aea7731dd7c..e711fd13822 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -504,7 +504,7 @@ typedef enum eBrushSculptTool { SCULPT_TOOL_ELASTIC_DEFORM = 21, SCULPT_TOOL_POSE = 22, SCULPT_TOOL_MULTIPLANE_SCRAPE = 23, - SCULPT_TOOL_TOPOLOGY = 24, + SCULPT_TOOL_SLIDE_RELAX = 24, } eBrushSculptTool; /* Brush.uv_sculpt_tool */ @@ -519,7 +519,7 @@ typedef enum eBrushUVSculptTool { ELEM(t, \ SCULPT_TOOL_DRAW, \ SCULPT_TOOL_DRAW_SHARP, \ - SCULPT_TOOL_TOPOLOGY, \ + SCULPT_TOOL_SLIDE_RELAX, \ SCULPT_TOOL_CREASE, \ SCULPT_TOOL_BLOB, \ SCULPT_TOOL_LAYER, \ @@ -542,7 +542,7 @@ typedef enum eBrushUVSculptTool { SCULPT_TOOL_THUMB, \ SCULPT_TOOL_LAYER, \ SCULPT_TOOL_DRAW_SHARP, \ - SCULPT_TOOL_TOPOLOGY, \ + SCULPT_TOOL_SLIDE_RELAX, \ SCULPT_TOOL_ELASTIC_DEFORM, \ SCULPT_TOOL_POSE, \ \ @@ -557,7 +557,7 @@ typedef enum eBrushUVSculptTool { SCULPT_TOOL_ROTATE, \ SCULPT_TOOL_THUMB, \ SCULPT_TOOL_DRAW_SHARP, \ - SCULPT_TOOL_TOPOLOGY, \ + SCULPT_TOOL_SLIDE_RELAX, \ SCULPT_TOOL_MASK) == 0) /* ImagePaintSettings.tool */ |