[Bf-blender-cvs] [d6dcf5b1ffd] master: Sculpt: Fix crash hovering mouse onto multire surface

Sergey Sharybin noreply at git.blender.org
Wed Sep 25 12:45:36 CEST 2019


Commit: d6dcf5b1ffd158558436f02213ccba0a7f8cc3cc
Author: Sergey Sharybin
Date:   Wed Sep 25 12:43:27 2019 +0200
Branches: master
https://developer.blender.org/rBd6dcf5b1ffd158558436f02213ccba0a7f8cc3cc

Sculpt: Fix crash hovering mouse onto multire surface

The check around function which is only supposed to be used for
non-multires case was gone after aea8c0102ac.

===================================================================

M	source/blender/editors/sculpt_paint/sculpt.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index c9e815bbf10..97a1f7403bd 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -6371,7 +6371,13 @@ bool sculpt_cursor_geometry_info_update(bContext *C,
   /* Update the active vertex of the SculptSession */
   ss->active_vertex_index = srd.active_vertex_index;
 
-  copy_v3_v3(out->active_vertex_co, sculpt_vertex_co_get(ss, srd.active_vertex_index));
+  if (!ss->multires) {
+    copy_v3_v3(out->active_vertex_co, sculpt_vertex_co_get(ss, srd.active_vertex_index));
+  }
+  else {
+    zero_v3(out->active_vertex_co);
+  }
+
   copy_v3_v3(out->location, ray_normal);
   mul_v3_fl(out->location, srd.depth);
   add_v3_v3(out->location, ray_start);



More information about the Bf-blender-cvs mailing list