[Bf-blender-cvs] [ff1ea600c98] master: Fix T68675: particle edit mode makes blender crash

Philipp Oeser noreply at git.blender.org
Thu Aug 15 11:59:32 CEST 2019


Commit: ff1ea600c98ba542c3b950fcfaf350626e078899
Author: Philipp Oeser
Date:   Thu Aug 15 11:39:45 2019 +0200
Branches: master
https://developer.blender.org/rBff1ea600c98ba542c3b950fcfaf350626e078899

Fix T68675: particle edit mode makes blender crash

In rB9c010c44f420, DRW_mesh_batch_cache_create_requested was changed to
take a scene (instead of toolsettings directly), but
DRW_draw_depth_object is calling this with with NULL, just checking for
this seems to fix...

Reviewers: fclem

Maniphest Tasks: T68675

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

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

M	source/blender/draw/intern/draw_cache_impl_mesh.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 8c89ac4703c..12c6a715685 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -969,7 +969,10 @@ void DRW_mesh_batch_cache_free_old(Mesh *me, int ctime)
 void DRW_mesh_batch_cache_create_requested(
     Object *ob, Mesh *me, const Scene *scene, const bool is_paint_mode, const bool use_hide)
 {
-  const ToolSettings *ts = scene->toolsettings;
+  const ToolSettings *ts = NULL;
+  if (scene) {
+    ts = scene->toolsettings;
+  }
   MeshBatchCache *cache = mesh_batch_cache_get(me);
 
   /* Early out */



More information about the Bf-blender-cvs mailing list