[Bf-blender-cvs] [25de3e52941] lanpr-under-gp: LineArt: Handle accidental scene->master_collection == NULL situation.
YimingWu
noreply at git.blender.org
Tue Jul 7 15:21:10 CEST 2020
Commit: 25de3e52941afec3a5e10c9c7ae4cb0e5e3809c9
Author: YimingWu
Date: Tue Jul 7 21:21:05 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB25de3e52941afec3a5e10c9c7ae4cb0e5e3809c9
LineArt: Handle accidental scene->master_collection == NULL situation.
===================================================================
M source/blender/editors/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 4d8b0941ecc..fe871c529a4 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -1648,6 +1648,11 @@ static void lineart_make_render_geometry_buffers_object(Object *ob,
int ED_lineart_object_collection_usage_check(Collection *c, Object *ob)
{
CollectionChild *cc;
+
+ if (!c) {
+ return OBJECT_FEATURE_LINE_INHERENT;
+ }
+
int object_is_used = (ob->lineart.usage == OBJECT_FEATURE_LINE_INCLUDE ||
ob->lineart.usage == OBJECT_FEATURE_LINE_INHERENT);
More information about the Bf-blender-cvs
mailing list