[Bf-blender-cvs] [a5fa9ec3101] temp_bmesh_multires: Fix another crash
Joseph Eagar
noreply at git.blender.org
Tue Apr 13 10:44:52 CEST 2021
Commit: a5fa9ec3101d281146d268fe3a2f7b030a72afff
Author: Joseph Eagar
Date: Tue Apr 13 01:44:29 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBa5fa9ec3101d281146d268fe3a2f7b030a72afff
Fix another crash
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_smooth.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 78ea03e3106..c454df1362b 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -8104,9 +8104,7 @@ bool SCULPT_cursor_geometry_info_update(bContext *C,
/* Update the active vertex of the SculptSession. */
ss->active_vertex_index = srd.active_vertex_index;
- if (BKE_pbvh_type(ss->pbvh) != PBVH_BMESH) {
- SCULPT_vertex_random_access_ensure(ss);
- }
+ SCULPT_vertex_random_access_ensure(ss);
copy_v3_v3(out->active_vertex_co, SCULPT_active_vertex_co_get(ss));
switch (BKE_pbvh_type(ss->pbvh)) {
diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.c b/source/blender/editors/sculpt_paint/sculpt_smooth.c
index 7ec4b6e2e3b..20889c75d3b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_smooth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_smooth.c
@@ -463,10 +463,7 @@ void SCULPT_smooth(Sculpt *sd,
return;
}
- if (type != PBVH_BMESH) {
- SCULPT_vertex_random_access_ensure(ss);
- }
-
+ SCULPT_vertex_random_access_ensure(ss);
SCULPT_boundary_info_ensure(ob);
#ifdef PROXY_ADVANCED
@@ -827,10 +824,7 @@ void SCULPT_smooth_vcol_boundary(
return;
}
- if (type != PBVH_BMESH) {
- SCULPT_vertex_random_access_ensure(ss);
- }
-
+ SCULPT_vertex_random_access_ensure(ss);
SCULPT_boundary_info_ensure(ob);
#ifdef PROXY_ADVANCED
More information about the Bf-blender-cvs
mailing list