griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix PBVH search callback in pose and elastic deform

Browse Source 
Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5947
This commit is contained in:
Pablo Dobarro
2019-09-30 14:56:04 +02:00
parent 6b419c18b0
commit 61efeb6df9
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -5185,13 +5185,7 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush, UnifiedPaintSe
/* These brushes need to update all nodes as they are not constrained by the brush radius */
if (brush->sculpt_tool == SCULPT_TOOL_ELASTIC_DEFORM) {
SculptSearchSphereData data = {
.ss = ss,
.sd = sd,
.radius_squared = FLT_MAX,
.original = true,
};
BKE_pbvh_search_gather(ss->pbvh, NULL, &data, &nodes, &totnode);
BKE_pbvh_search_gather(ss->pbvh, NULL, NULL, &nodes, &totnode);
}
else if (brush->sculpt_tool == SCULPT_TOOL_POSE) {
float final_radius = ss->cache->radius * (1 + brush->pose_offset);
@@ -5201,7 +5195,7 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush, UnifiedPaintSe
.radius_squared = final_radius * final_radius,
.original = true,
};
BKE_pbvh_search_gather(ss->pbvh, NULL, &data, &nodes, &totnode);
BKE_pbvh_search_gather(ss->pbvh, sculpt_search_sphere_cb, &data, &nodes, &totnode);
}
else {
const bool use_original = sculpt_tool_needs_original(brush->sculpt_tool) ? true :