tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2023-10-04 14:43:42 +02:00
parent 3d5c6dc218
commit 2d2c7457cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_object.cc
View File

@ -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;