Merge branch 'blender-v3.0-release'

3 files changed, 0 insertions, 4 deletions

diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 55252210a78..c4d04392cba 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1384,7 +1384,6 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
             tex->iuser.frames = 1;
             tex->iuser.sfra = 1;
-            tex->iuser.ok = 1;
           }
         }
       }
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index e809d580fd2..4333bdb851c 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4517,7 +4517,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
     if (!DNA_struct_elem_find(fd->filesdna, "Image", "ListBase", "tiles")) {
       for (Image *ima = bmain->images.first; ima; ima = ima->id.next) {
         ImageTile *tile = MEM_callocN(sizeof(ImageTile), "Image Tile");
-        tile->ok = 1;
         tile->tile_number = 1001;
         BLI_addtail(&ima->tiles, tile);
       }
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 62cc2aa3662..37bf4898cb3 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -391,7 +391,6 @@ static void do_version_ntree_242_2(bNodeTree *ntree)
           iuser->sfra = nia->sfra;
           iuser->offset = nia->nr - 1;
           iuser->cycl = nia->cyclic;
-          iuser->ok = 1;
 
           node->storage = iuser;
           MEM_freeN(nia);
@@ -399,7 +398,6 @@ static void do_version_ntree_242_2(bNodeTree *ntree)
         else {
           ImageUser *iuser = node->storage = MEM_callocN(sizeof(ImageUser), "node image user");
           iuser->sfra = 1;
-          iuser->ok = 1;
         }
       }
     }