[Bf-blender-cvs] [a47d1ad9d58] blender-v3.4-release: Fix T103031: ViewLayer: Crash in indirect_only_get due to missing null check
Aras Pranckevicius
noreply at git.blender.org
Wed Dec 14 22:23:26 CET 2022
Commit: a47d1ad9d58b5596f942b28c03f07b4bded25ea6
Author: Aras Pranckevicius
Date: Fri Dec 9 20:20:11 2022 +0200
Branches: blender-v3.4-release
https://developer.blender.org/rBa47d1ad9d58b5596f942b28c03f07b4bded25ea6
Fix T103031: ViewLayer: Crash in indirect_only_get due to missing null check
Previous fix (rBe00f76c6a8cca) accidentally lost a null check.
Fixes T103031.
===================================================================
M source/blender/makesrna/intern/rna_object_api.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 366a3597ce6..3d4d72cefaf 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -205,6 +205,10 @@ static bool rna_Object_holdout_get(Object *ob, bContext *C, PointerRNA *view_lay
static bool rna_Object_indirect_only_get(Object *ob, bContext *C, PointerRNA *view_layer_ptr)
{
Base *base = find_view_layer_base_with_synced_ensure(ob, C, view_layer_ptr, NULL, NULL);
+ if (!base) {
+ return false;
+ }
+
return ((base->flag & BASE_INDIRECT_ONLY) != 0);
}
More information about the Bf-blender-cvs
mailing list