diff options
Diffstat (limited to 'source/blender/blenloader/intern/versioning_legacy.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 27e49522be4..7d276ed5ed7 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1301,7 +1301,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) Object *ob; for (vf = main->vfont.first; vf; vf = vf->id.next) { - if (strcmp(vf->name + strlen(vf->name)-6, ".Bfont") == 0) { + if (STREQ(vf->name + strlen(vf->name)-6, ".Bfont")) { strcpy(vf->name, FO_BUILTIN_NAME); } } @@ -2185,8 +2185,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) cam->flag |= CAM_SHOWPASSEPARTOUT; /* make sure old cameras have title safe on */ - if (!(cam->flag & CAM_SHOWTITLESAFE)) - cam->flag |= CAM_SHOWTITLESAFE; + if (!(cam->flag & CAM_SHOW_SAFE_MARGINS)) + cam->flag |= CAM_SHOW_SAFE_MARGINS; /* set an appropriate camera passepartout alpha */ if (!(cam->passepartalpha)) @@ -2316,7 +2316,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) if (main->versionfile == 241) { Image *ima; for (ima = main->image.first; ima; ima = ima->id.next) - if (strcmp(ima->name, "Compositor") == 0) { + if (STREQ(ima->name, "Compositor")) { strcpy(ima->id.name + 2, "Viewer Node"); strcpy(ima->name, "Viewer Node"); } @@ -2504,11 +2504,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) ima->gen_x = 256; ima->gen_y = 256; ima->gen_type = 1; - if (0 == strncmp(ima->id.name + 2, "Viewer Node", sizeof(ima->id.name) - 2)) { + if (STREQLEN(ima->id.name + 2, "Viewer Node", sizeof(ima->id.name) - 2)) { ima->source = IMA_SRC_VIEWER; ima->type = IMA_TYPE_COMPOSITE; } - if (0 == strncmp(ima->id.name + 2, "Render Result", sizeof(ima->id.name) - 2)) { + if (STREQLEN(ima->id.name + 2, "Render Result", sizeof(ima->id.name) - 2)) { ima->source = IMA_SRC_VIEWER; ima->type = IMA_TYPE_R_RESULT; } |