archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

ID management: use FOREACH_MAIN_ID in some places.

Browse Source
This commit is contained in:
Bastien Montagne
2019-02-18 16:39:01 +01:00
parent 4977321c5a
commit b36f78abf4
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/blenloader/intern/blend_validate.c
View File

@@ -149,30 +149,29 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports)
/** Check (and fix if needed) that shape key's 'from' pointer is valid. */
bool BLO_main_validate_shapekeys(Main *bmain, ReportList *reports)
{
ID *id;
bool is_valid = true;
BKE_main_lock(bmain);
ListBase *lbarray[MAX_LIBARRAY];
int i = set_listbasepointers(bmain, lbarray);
while (i--) {
for (ID *id = lbarray[i]->first; id != NULL; id = id->next) {
if (!BKE_key_idtype_support(GS(id->name))) {
break;
}
if (id->lib == NULL) {
/* We assume lib data is valid... */
Key *shapekey = BKE_key_from_id(id);
if (shapekey != NULL && shapekey->from != id) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s uses shapekey %s, but its 'from' pointer is invalid (%p), fixing...",
id->name, shapekey->id.name, shapekey->from);
shapekey->from = id;
}
FOREACH_MAIN_ID_BEGIN(bmain, id)
{
if (!BKE_key_idtype_support(GS(id->name))) {
break;
}
if (id->lib == NULL) {
/* We assume lib data is valid... */
Key *shapekey = BKE_key_from_id(id);
if (shapekey != NULL && shapekey->from != id) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s uses shapekey %s, but its 'from' pointer is invalid (%p), fixing...",
id->name, shapekey->id.name, shapekey->from);
shapekey->from = id;
}
}
}
FOREACH_MAIN_ID_END;
BKE_main_unlock(bmain);