Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-04-12 14:52:47 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-04-12 14:52:47 +0400
commit0d86c3f84c22aadad8719492ca27a7c9e88d2996 (patch)
tree6832444b03813a3c5f7f43544b37b1575ea1fe3e /source/blender/blenloader
parent677a96e189289b82e28f3ba391061cb610bebc0a (diff)
Image draw method option
This option replaces previously added GPU limit option, which became tricky to follow after GLSL display space conversion. There're 4 modes available: - AUTO which will try to guess which mode is best to use. Currently It'll try using GLSL and if it fails, will fallback to 2D textures. Probably it'll make sense checking on whether 2D textures works well but currently such behavior shall be sufficient. Later we could make this method smarter (for example don't try to use GLSL on certain GPU or so). - GLSL will currently behave the same way as AUTO, but it is intended to always try using GLSL (unless it can not be used because of existing limitation of dither and RGB curves). - 2D Textures will use CPU-based color space conversion and use OGL 2D Texture to display the image. Image will be displayed in tiles, so there shall be no big GPU memory consumption. - DrawPixels will straightly fallback to glDrawPixels without trying to use any fancy GPU stuff. Hopefully this will also fix #34943: Blender crashes when resizing the Compositing Screen Window
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3723fe54cec..fdeb48e07ee 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7764,14 +7764,8 @@ static void do_versions_userdef(FileData *fd, BlendFileData *bfd)
copy_v4_v4_char(btheme->tseq.grid, btheme->tseq.back);
}
}
-
- if (bmain->versionfile < 267) {
-
- if (!DNA_struct_elem_find(fd->filesdna, "UserDef", "short", "image_gpubuffer_limit"))
- user->image_gpubuffer_limit = 20;
-
- }
}
+
static void do_versions(FileData *fd, Library *lib, Main *main)
{
/* WATCH IT!!!: pointers from libdata have not been converted */