[Bf-blender-cvs] [8f4b7083d3a] master: Fix T65049 Crash cause by NULL geom pointer
Clément Foucault
noreply at git.blender.org
Thu May 30 19:35:42 CEST 2019
Commit: 8f4b7083d3a553d5cf00df1bfcda8da4035f0654
Author: Clément Foucault
Date: Thu May 30 18:28:05 2019 +0200
Branches: master
https://developer.blender.org/rB8f4b7083d3a553d5cf00df1bfcda8da4035f0654
Fix T65049 Crash cause by NULL geom pointer
===================================================================
M source/blender/draw/engines/basic/basic_engine.c
===================================================================
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index beff451256d..dd7f4683ce0 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -154,7 +154,9 @@ static void basic_cache_populate(void *vedata, Object *ob)
if (is_flat_object_viewed_from_side) {
/* Avoid losing flat objects when in ortho views (see T56549) */
struct GPUBatch *geom = DRW_cache_object_all_edges_get(ob);
- DRW_shgroup_call(stl->g_data->depth_shgrp, geom, ob);
+ if (geom) {
+ DRW_shgroup_call(stl->g_data->depth_shgrp, geom, ob);
+ }
return;
}
}
More information about the Bf-blender-cvs
mailing list