From 2d2c7457cf3e4c72e9ff449eb1cd9a858ea600df Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 4 Oct 2023 14:43:42 +0200 Subject: [PATCH] Fix #112548: Assert in object parenting liboverride code. Dummy mistake in commit(s) a few months ago that fixed/improved handling of parenting between objects in liboverride context, trying to access an Enum propoerty as an int one... This will have to be backported to 3.6LTS as well. --- source/blender/makesrna/intern/rna_object.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 3e3f15ba81a..da03be4a099 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -717,8 +717,8 @@ static bool rna_Object_parent_type_override_apply(Main *bmain, /* We need a special handling here because setting parent resets invert parent matrix, * which is evil in our case. */ Object *ob = (Object *)(ptr_dst->data); - const int parent_type_dst = RNA_property_int_get(ptr_dst, prop_dst); - const int parent_type_src = RNA_property_int_get(ptr_src, prop_src); + const int parent_type_dst = RNA_property_enum_get(ptr_dst, prop_dst); + const int parent_type_src = RNA_property_enum_get(ptr_src, prop_src); if (parent_type_dst == parent_type_src) { return false;