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

Fix mistake in previous commit.

Browse Source
This commit is contained in:
Bastien Montagne
2019-03-18 11:40:03 +01:00
parent 1b06e3378a
commit 07355ff74b
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_main.h
View File

@@ -169,7 +169,7 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
{ \
ListBase *_lb; \
FOREACH_MAIN_LISTBASE_BEGIN(_bmain, _lb) { \
FOREACH_MAIN_LISTBASE_ID_BEGIN(_lbarray[_i], _id)
FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id)
#define FOREACH_MAIN_ID_END \
FOREACH_MAIN_LISTBASE_ID_END; \

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

@@ -149,29 +149,34 @@ 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)
{
ListBase *lb;
ID *id;
bool is_valid = true;
BKE_main_lock(bmain);
FOREACH_MAIN_ID_BEGIN(bmain, id)
FOREACH_MAIN_LISTBASE_BEGIN(bmain, lb)
{
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_LISTBASE_ID_BEGIN(lb, 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_LISTBASE_ID_END;
}
FOREACH_MAIN_ID_END;
FOREACH_MAIN_LISTBASE_END;
BKE_main_unlock(bmain);