[Bf-blender-cvs] [27b82bbb75c] master: Fix T69816: Using Transform gizmos in Sculpt Mode while MultiRes is activated crashes Blender

[Pablo Dobarro]

Commit: 27b82bbb75c5fd527b6b22682f8d173f6040644a
Author: Pablo Dobarro
Date:   Fri Sep 13 16:42:33 2019 +0200
Branches: master
https://developer.blender.org/rB27b82bbb75c5fd527b6b22682f8d173f6040644a

Fix T69816: Using Transform gizmos in Sculpt Mode while MultiRes is activated crashes Blender

Reviewed By: jbakker

Maniphest Tasks: T69816

Differential Revision: https://developer.blender.org/D5779

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

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 768a6976567..b0c4bcdef0e 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -7896,7 +7896,12 @@ static void sculpt_filter_cache_init(Object *ob, Sculpt *sd)
   for (int i = 0; i < totnode; i++) {
     BKE_pbvh_node_mark_normals_update(nodes[i]);
   }
-  BKE_pbvh_update_normals(ss->pbvh, NULL);
+
+  /* mesh->runtime.subdiv_ccg is not available. Updating of the normals is done during drawing.
+   * Filters can't use normals in multires. */
+  if (BKE_pbvh_type(ss->pbvh) != PBVH_GRIDS) {
+    BKE_pbvh_update_normals(ss->pbvh, NULL);
+  }
 
   SculptThreadedTaskData data = {
       .sd = sd,