[Bf-blender-cvs] [54ec0559c8e] master: Fix T64384 : Crash when switching to wireframe on tree_creature blend

Clément Foucault noreply at git.blender.org
Thu May 9 14:42:20 CEST 2019


Commit: 54ec0559c8ef203f2c029fc0e43373538ae5515f
Author: Clément Foucault
Date:   Thu May 9 14:36:49 2019 +0200
Branches: master
https://developer.blender.org/rB54ec0559c8ef203f2c029fc0e43373538ae5515f

Fix T64384 : Crash when switching to wireframe on tree_creature blend

Was missing NULL pointer check

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

M	source/blender/draw/modes/overlay_mode.c

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

diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index ce49eb0e688..99ab842b3bf 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -367,7 +367,9 @@ static void overlay_cache_populate(void *vedata, Object *ob)
         *dupli_data = MEM_callocN(sizeof(OVERLAY_DupliData), "OVERLAY_DupliData");
       }
       else {
-        DRW_shgroup_call_object_add((*dupli_data)->shgrp, (*dupli_data)->geom, ob);
+        if ((*dupli_data)->shgrp && (*dupli_data)->geom) {
+          DRW_shgroup_call_object_add((*dupli_data)->shgrp, (*dupli_data)->geom, ob);
+        }
         return;
       }
     }



More information about the Bf-blender-cvs mailing list