diff options
Diffstat (limited to 'source/blender/blenloader/intern/versioning_250.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 8a7bc375ea9..e56c1995363 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -132,7 +132,7 @@ static void sequencer_init_preview_region(ARegion *region) region->v2d.max[0] = 12000.0f; region->v2d.max[1] = 12000.0f; region->v2d.cur = region->v2d.tot; - region->v2d.align = V2D_ALIGN_FREE; // (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y); + region->v2d.align = V2D_ALIGN_FREE; /* `(V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y)` */ region->v2d.keeptot = V2D_KEEPTOT_FREE; } @@ -655,8 +655,10 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Tex *tx; ParticleSettings *part; Object *ob; - // PTCacheID *pid; - // ListBase pidlist; +#if 0 + PTCacheID *pid; + ListBase pidlist; +#endif bSound *sound; Sequence *seq; @@ -766,12 +768,15 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* set old pointcaches to have disk cache flag */ for (ob = bmain->objects.first; ob; ob = ob->id.next) { - // BKE_ptcache_ids_from_object(&pidlist, ob); +#if 0 + BKE_ptcache_ids_from_object(&pidlist, ob); - // for (pid = pidlist.first; pid; pid = pid->next) - // pid->cache->flag |= PTCACHE_DISK_CACHE; + for (pid = pidlist.first; pid; pid = pid->next) { + pid->cache->flag |= PTCACHE_DISK_CACHE; + } - // BLI_freelistN(&pidlist); + BLI_freelistN(&pidlist); +#endif } /* type was a mixed flag & enum. move the 2d flag elsewhere */ @@ -789,18 +794,23 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Tex *tex; Scene *sce; ToolSettings *ts; - // PTCacheID *pid; - // ListBase pidlist; +#if 0 + PTCacheID *pid; + ListBase pidlist; +#endif for (ob = bmain->objects.first; ob; ob = ob->id.next) { - // BKE_ptcache_ids_from_object(&pidlist, ob); +#if 0 + BKE_ptcache_ids_from_object(&pidlist, ob); - // for (pid = pidlist.first; pid; pid = pid->next) { - // if (BLI_listbase_is_empty(pid->ptcaches)) - // pid->ptcaches->first = pid->ptcaches->last = pid->cache; - //} + for (pid = pidlist.first; pid; pid = pid->next) { + if (BLI_listbase_is_empty(pid->ptcaches)) { + pid->ptcaches->first = pid->ptcaches->last = pid->cache; + } + } - // BLI_freelistN(&pidlist); + BLI_freelistN(&pidlist); +#endif if (ob->totcol && ob->matbits == NULL) { int a; @@ -842,7 +852,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) Object *ob; for (ob = bmain->objects.first; ob; ob = ob->id.next) { - if (ob->flag & 8192) { // OB_POSEMODE = 8192 + if (ob->flag & 8192) { /* OB_POSEMODE = 8192. */ ob->mode |= OB_MODE_POSE; } } @@ -1395,7 +1405,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) } if ((sce->r.ffcodecdata.flags & FFMPEG_MULTIPLEX_AUDIO) == 0) { - sce->r.ffcodecdata.audio_codec = 0x0; // CODEC_ID_NONE + sce->r.ffcodecdata.audio_codec = 0x0; /* `CODEC_ID_NONE` */ } SEQ_ALL_BEGIN (sce->ed, seq) { @@ -1735,7 +1745,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* New Settings */ if (!MAIN_VERSION_ATLEAST(bmain, 252, 5)) { - brush->flag |= BRUSH_SPACE_ATTEN; // explicitly enable adaptive space + brush->flag |= BRUSH_SPACE_ATTEN; /* Explicitly enable adaptive space. */ /* spacing was originally in pixels, convert it to percentage for new version * size should not be zero due to sanity check above |