diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 16:45:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 18:38:17 +0300 |
| commit | 8f7ae20f799cbba7a5ce60b18efb8401328aab44 (patch) | |
| tree | 4e9bf30286d0d4ffb47fb13bd59e50fd2e54545e /source/blender/blenloader | |
| parent | c94b3b19a2c07ce2617bf4998a1634f020660e4d (diff) | |
Cleanup: rename tpageflag to gpuflag, make it purely runtime data.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 8fcae12a4fd..8259a5ef510 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1678,7 +1678,7 @@ void blo_end_image_pointer_map(FileData *fd, Main *oldmain) for (; ima; ima = ima->id.next) { ima->cache = newimaadr(fd, ima->cache); if (ima->cache == NULL) { - ima->tpageflag &= ~IMA_GLBIND_IS_DATA; + ima->gpuflag = 0; for (i = 0; i < TEXTARGET_COUNT; i++) { ima->gputexture[i] = NULL; } @@ -3945,7 +3945,7 @@ static void direct_link_image(FileData *fd, Image *ima) /* if not restored, we keep the binded opengl index */ if (!ima->cache) { - ima->tpageflag &= ~IMA_GLBIND_IS_DATA; + ima->gpuflag = 0; for (int i = 0; i < TEXTARGET_COUNT; i++) { ima->gputexture[i] = NULL; } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index cfba6f803c9..9cb63e773cd 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2645,12 +2645,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) IMA_FLAG_DEPRECATED_8 | IMA_FLAG_DEPRECATED_15 | IMA_FLAG_DEPRECATED_16); - image->tpageflag &= ~( - IMA_TPAGEFLAG_DEPRECATED_0 | - IMA_TPAGEFLAG_DEPRECATED_1 | - IMA_TPAGEFLAG_DEPRECATED_2 | - IMA_TPAGEFLAG_DEPRECATED_4 | - IMA_TPAGEFLAG_DEPRECATED_5); } for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { |