Merge branch 'blender-v3.0-release'

This commit is contained in:
Hans Goudey 2021-11-02 07:59:35 -05:00
commit e64d4d0200
1 changed files with 3 additions and 1 deletions

View File

@ -622,7 +622,9 @@ static PyObject *BPy_IDPropertyUIManager_update_from(BPy_IDPropertyUIManager *se
IDP_ui_data_free(property);
}
property->ui_data = IDP_ui_data_copy(ui_manager_src->property);
if (ui_manager_src->property && ui_manager_src->property->ui_data) {
property->ui_data = IDP_ui_data_copy(ui_manager_src->property);
}
Py_RETURN_NONE;
}