Merge remote-tracking branch 'origin/blender-v4.5-release'
This commit is contained in:
@@ -651,6 +651,7 @@ void rna_Pose_custom_shape_set(PointerRNA *ptr, PointerRNA value, struct ReportL
|
||||
Object *custom_shape = static_cast<Object *>(value.data);
|
||||
|
||||
if (!custom_shape) {
|
||||
id_us_min(reinterpret_cast<ID *>(pchan->custom));
|
||||
pchan->custom = nullptr;
|
||||
return;
|
||||
}
|
||||
@@ -663,7 +664,9 @@ void rna_Pose_custom_shape_set(PointerRNA *ptr, PointerRNA value, struct ReportL
|
||||
return;
|
||||
}
|
||||
|
||||
id_us_min(reinterpret_cast<ID *>(pchan->custom));
|
||||
pchan->custom = custom_shape;
|
||||
id_us_plus(reinterpret_cast<ID *>(pchan->custom));
|
||||
}
|
||||
|
||||
bool rna_Pose_custom_shape_object_poll(PointerRNA * /*ptr*/, PointerRNA value)
|
||||
|
||||
Reference in New Issue
Block a user