[Bf-blender-cvs] [4dc71367c70] master: Fix T65918 DRW: Crash when add a any modifier to a curve
Clément Foucault
noreply at git.blender.org
Wed Jun 19 13:54:41 CEST 2019
Commit: 4dc71367c7001a6d5395780e5493076d5d700300
Author: Clément Foucault
Date: Wed Jun 19 12:20:55 2019 +0200
Branches: master
https://developer.blender.org/rB4dc71367c7001a6d5395780e5493076d5d700300
Fix T65918 DRW: Crash when add a any modifier to a curve
===================================================================
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index bbf364960c9..e8c600ee545 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -3221,10 +3221,12 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
break;
}
geom = DRW_cache_lattice_wire_get(ob, false);
+ if (geom == NULL) {
+ break;
+ }
if (theme_id == TH_UNDEFINED) {
theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
}
-
shgroup = shgroup_theme_id_to_wire(sgl, theme_id, ob->base_flag);
DRW_shgroup_call(shgroup, geom, ob);
}
@@ -3236,6 +3238,9 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
break;
}
geom = DRW_cache_curve_edge_wire_get(ob);
+ if (geom == NULL) {
+ break;
+ }
if (theme_id == TH_UNDEFINED) {
theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
}
More information about the Bf-blender-cvs
mailing list