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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-20 13:47:06 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-20 14:32:36 +0300
commit7cbb8f20a4b479380dac1d2a2f7c7f85ede408be (patch)
tree3c5b5a91f2cdc2eb285cfa41886053366337ff11 /source/blender/blenloader
parented0c9654ddfdcbe19d8094d4b4a43f0f06d9ee5c (diff)
GPU: automatically draw images with GLSL shader depending on resolution
This adds a new "Automatic" image display method which uses GLSL shaders for most images. It only does CPU side color management for higher res images where sending big float buffers to the GPU is likely to be a bottleneck or cause memory usage problem. Automatic is the default now, previously it was 2D Texture.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 65a19ca80c1..069b1907cce 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -491,6 +491,12 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
userdef->move_threshold = 2;
}
+ if (!USER_VERSION_ATLEAST(280, 58)) {
+ if (userdef->image_draw_method != IMAGE_DRAW_METHOD_GLSL) {
+ userdef->image_draw_method = IMAGE_DRAW_METHOD_AUTO;
+ }
+ }
+
/**
* Include next version bump.
*/
@@ -505,9 +511,6 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
if (userdef->pixelsize == 0.0f)
userdef->pixelsize = 1.0f;
- if (userdef->image_draw_method == 0)
- userdef->image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
-
for (bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
do_versions_theme(userdef, btheme);
}