diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3c57de0a9d8..5449baedcb1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4507,8 +4507,9 @@ static void direct_link_pointcache_cb(FileData *fd, void *data) /* the cache saves non-struct data without DNA */ if (pm->data[i] && ptcache_data_struct[i][0] == '\0' && (fd->flags & FD_FLAGS_SWITCH_ENDIAN)) { - int tot = (BKE_ptcache_data_size(i) * pm->totpoint) / - sizeof(int); /* data_size returns bytes */ + /* data_size returns bytes. */ + int tot = (BKE_ptcache_data_size(i) * pm->totpoint) / sizeof(int); + int *poin = pm->data[i]; BLI_endian_switch_int32_array(poin, tot); @@ -4776,8 +4777,10 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles) if (psys->particles && psys->particles->boid) { pa = psys->particles; pa->boid = newdataadr(fd, pa->boid); - pa->boid->ground = - NULL; /* This is purely runtime data, but still can be an issue if left dangling. */ + + /* This is purely runtime data, but still can be an issue if left dangling. */ + pa->boid->ground = NULL; + for (a = 1, pa++; a < psys->totpart; a++, pa++) { pa->boid = (pa - 1)->boid + 1; pa->boid->ground = NULL; @@ -7169,8 +7172,10 @@ static void direct_link_area(FileData *fd, ScrArea *area) BLI_listbase_clear(&area->handlers); area->type = NULL; /* spacetype callbacks */ - area->butspacetype = - SPACE_EMPTY; /* Should always be unset so that rna_Area_type_get works correctly */ + + /* Should always be unset so that rna_Area_type_get works correctly. */ + area->butspacetype = SPACE_EMPTY; + area->region_active_win = -1; area->flag &= ~AREA_FLAG_ACTIVE_TOOL_UPDATE; @@ -7180,8 +7185,9 @@ static void direct_link_area(FileData *fd, ScrArea *area) /* if we do not have the spacetype registered we cannot * free it, so don't allocate any new memory for such spacetypes. */ if (!BKE_spacetype_exists(area->spacetype)) { - area->butspacetype = - area->spacetype; /* Hint for versioning code to replace deprecated space types. */ + /* Hint for versioning code to replace deprecated space types. */ + area->butspacetype = area->spacetype; + area->spacetype = SPACE_EMPTY; } |