From 6d64da1e67e319e826450cefc1f6541b0fbb57e9 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 23 Aug 2019 15:50:53 +0200 Subject: Fix potential issues when loading files with missing libraries This is a continuation of rB39f005eae8eed8b939579aff8c9a05a4f50e5e38 Now all the fields where we check for object type in RNA (like rna_Curve_object_poll) will have a safe guard for when this isn't the case. For example when loading files that has missing object libraries and all missing objects are replaced with empties (placeholders). Reviewed By: Brecht Differential Revision: http://developer.blender.org/D5425 --- source/blender/modifiers/intern/MOD_curve.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_curve.c') diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 7a07d9b28eb..bedd6e519eb 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -66,7 +66,12 @@ static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED { CurveModifierData *cmd = (CurveModifierData *)md; - return !cmd->object; + /* The object type check is only needed here in case we have a placeholder + * object assigned (because the library containing the curve is missing). + * + * In other cases it should be impossible to have a type missmatch. + */ + return !cmd->object || cmd->object->type != OB_CURVE; } static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData) -- cgit v1.2.3