diff options
author | Dalai Felinto <dalai@blender.org> | 2022-01-28 13:11:51 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2022-01-28 13:11:51 +0300 |
commit | cfe18c3b949d019e2e77203265528e8a995b7517 (patch) | |
tree | 87b856333e35e655b98feaba7efc6e55bc435e93 /source/blender | |
parent | c0225aa5739a4147f592b9a43bb210530d433a95 (diff) | |
parent | f756dc4812f3852bba54ee46c21288540f066672 (diff) |
Merge remote-tracking branch 'origin/blender-v3.1-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 54 | ||||
-rw-r--r-- | source/blender/draw/engines/image/image_drawing_mode.hh | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/image/image_private.hh | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/image/image_shader.cc | 22 | ||||
-rw-r--r-- | source/blender/draw/tests/shaders_test.cc | 3 |
6 files changed, 43 insertions, 42 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 091f9784697..7ae7da9b4b7 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -35,7 +35,7 @@ extern "C" { /* Blender patch version for bugfix releases. */ #define BLENDER_VERSION_PATCH 0 /** Blender release cycle stage: alpha/beta/rc/release. */ -#define BLENDER_VERSION_CYCLE alpha +#define BLENDER_VERSION_CYCLE beta /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 81fc6086951..90730439c51 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -782,19 +782,7 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - #blo_do_versions_300 in this file. - * - "versioning_userdef.c", #blo_do_versions_userdef - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - { - /* Keep this block, even when empty. */ - + if (!MAIN_VERSION_ATLEAST(bmain, 301, 6)) { { /* Ensure driver variable names are unique within the driver. */ ID *id; FOREACH_MAIN_ID_BEGIN (bmain, id) { @@ -829,6 +817,20 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - #blo_do_versions_300 in this file. + * - "versioning_userdef.c", #blo_do_versions_userdef + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } static void version_switch_node_input_prefix(Main *bmain) @@ -2485,18 +2487,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - "versioning_userdef.c", #blo_do_versions_userdef - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - { - /* Keep this block, even when empty. */ - + if (!MAIN_VERSION_ATLEAST(bmain, 301, 6)) { /* Add node storage for map range node. */ FOREACH_NODETREE_BEGIN (bmain, ntree, id) { LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { @@ -2557,4 +2548,17 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - "versioning_userdef.c", #blo_do_versions_userdef + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh index 8762a02458f..8eb98b40492 100644 --- a/source/blender/draw/engines/image/image_drawing_mode.hh +++ b/source/blender/draw/engines/image/image_drawing_mode.hh @@ -90,7 +90,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD void add_shgroups(const IMAGE_InstanceData *instance_data) const { const ShaderParameters &sh_params = instance_data->sh_params; - GPUShader *shader = IMAGE_shader_image_get(false); + GPUShader *shader = IMAGE_shader_image_get(); DRWShadingGroup *shgrp = DRW_shgroup_create(shader, instance_data->passes.image_pass); DRW_shgroup_uniform_vec2_copy(shgrp, "farNearDistances", sh_params.far_near); diff --git a/source/blender/draw/engines/image/image_private.hh b/source/blender/draw/engines/image/image_private.hh index 05ed2881145..c8968ddf9c6 100644 --- a/source/blender/draw/engines/image/image_private.hh +++ b/source/blender/draw/engines/image/image_private.hh @@ -72,7 +72,7 @@ class AbstractDrawingMode { }; /* image_shader.c */ -GPUShader *IMAGE_shader_image_get(bool is_tiled_image); +GPUShader *IMAGE_shader_image_get(); void IMAGE_shader_library_ensure(); void IMAGE_shader_free(); diff --git a/source/blender/draw/engines/image/image_shader.cc b/source/blender/draw/engines/image/image_shader.cc index 1c6abf36505..77cbaeec5a4 100644 --- a/source/blender/draw/engines/image/image_shader.cc +++ b/source/blender/draw/engines/image/image_shader.cc @@ -41,13 +41,13 @@ extern char datatoc_engine_image_vert_glsl[]; namespace blender::draw::image_engine { struct IMAGE_Shaders { - GPUShader *image_sh[2]; + GPUShader *image_sh; }; static struct { IMAGE_Shaders shaders; DRWShaderLibrary *lib; -} e_data = {{{nullptr}}}; /* Engine data */ +} e_data = {{nullptr}}; /* Engine data */ void IMAGE_shader_library_ensure() { @@ -60,19 +60,17 @@ void IMAGE_shader_library_ensure() } } -GPUShader *IMAGE_shader_image_get(bool is_tiled_image) +GPUShader *IMAGE_shader_image_get() { - const int index = is_tiled_image ? 1 : 0; IMAGE_Shaders *sh_data = &e_data.shaders; - if (sh_data->image_sh[index] == nullptr) { - sh_data->image_sh[index] = DRW_shader_create_with_shaderlib( - datatoc_engine_image_vert_glsl, - nullptr, - datatoc_engine_image_frag_glsl, - e_data.lib, - is_tiled_image ? "#define TILED_IMAGE\n" : nullptr); + if (sh_data->image_sh == nullptr) { + sh_data->image_sh = DRW_shader_create_with_shaderlib(datatoc_engine_image_vert_glsl, + nullptr, + datatoc_engine_image_frag_glsl, + e_data.lib, + nullptr); } - return sh_data->image_sh[index]; + return sh_data->image_sh; } void IMAGE_shader_free() diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc index 6f4dc226c84..b97298cbe95 100644 --- a/source/blender/draw/tests/shaders_test.cc +++ b/source/blender/draw/tests/shaders_test.cc @@ -185,8 +185,7 @@ static void test_image_glsl_shaders() { IMAGE_shader_library_ensure(); - EXPECT_NE(IMAGE_shader_image_get(false), nullptr); - EXPECT_NE(IMAGE_shader_image_get(true), nullptr); + EXPECT_NE(IMAGE_shader_image_get(), nullptr); IMAGE_shader_free(); } |