griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Bastien Montagne
2023-10-04 14:51:06 +02:00
parent 9d229aee19 2d2c7457cf
commit 43d7abc31a
1 changed files with 2 additions and 2 deletions
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;