diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-20 06:36:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-20 06:36:51 +0300 |
| commit | 79319b3fba306524eef71946098deda71a449134 (patch) | |
| tree | 69a126be503653f447eb4972f41dae8a9e0dd5ef /source/blender/editors/sculpt_paint/sculpt.c | |
| parent | 436004b6b17a99b878f6ac9ba79ed3c00c6d39c0 (diff) | |
Sculpt: remove workaround T25371
It's no longer needed,
and made calc_area_normal different to the normal from calc_area_normal_and_center.
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 9c7edb5b567..40ef8970d68 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -919,22 +919,6 @@ static void calc_area_normal( int count[2] = {0}; - /* Grab brush requires to test on original data (see T25371) */ - bool original; - - original = (brush->sculpt_tool == SCULPT_TOOL_GRAB) ? true : ss->cache->original; - /* In general the original coords are not available with dynamic - * topology - * - * Mask tool could not use undo nodes to get coordinates from - * since the coordinates are not stored in those nodes. - * And mask tool is not gonna to modify vertex coordinates, - * so we don't actually need to use modified coords. - */ - if (brush->sculpt_tool == SCULPT_TOOL_MASK) { - original = false; - } - #pragma omp parallel for schedule(guided) if ((sd->flags & SCULPT_USE_OPENMP) && totnode > SCULPT_OMP_LIMIT) for (n = 0; n < totnode; n++) { PBVHVertexIter vd; @@ -947,7 +931,7 @@ static void calc_area_normal( unode = sculpt_undo_push_node(ob, nodes[n], SCULPT_UNDO_COORDS); sculpt_brush_test_init(ss, &test); - use_original = (original && (unode->co || unode->bm_entry)); + use_original = (ss->cache->original && (unode->co || unode->bm_entry)); /* when the mesh is edited we can't rely on original coords * (original mesh may not even have verts in brush radius) */ |