From 0a4b5eb73ea585f32c4e815da6af2fd61e059889 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 27 Mar 2023 15:53:20 +0200 Subject: [PATCH 1/2] Fix: Compiling Shader Builder. IMath is required for building with vulkan. This patch adds dependencies to shader_builder for now. Currently there is a difference between windows and other OS's in which variable the library is stored. Might be because imath isn't a direct dependecy. As this is a compilation error I did the quickest solution and check with platform module what would be the best solution. Pull Request: https://projects.blender.org/blender/blender/pulls/106180 --- source/blender/gpu/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index a7c97f3db8c..aefa41ccdc5 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -800,6 +800,8 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER) bf_blenlib bf_intern_ghost ${PLATFORM_LINKLIBS} + ${IMATH_LIBRARIES} + ${IMATH_LIBRARY} ) target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR}) From b27ffee8f39a7ff05d21a68c863f2786937a2cb1 Mon Sep 17 00:00:00 2001 From: Paul-Minguet Date: Mon, 27 Mar 2023 16:20:30 +0200 Subject: [PATCH 2/2] Fix #105917: Correct compositing map range clamp tooltip The tooltip of the map range node in the compositing section was displaying that the output value was between 0.0 and 1.0 whereas it is between To Min and To Max value so I just changed the string. Pull Request: https://projects.blender.org/blender/blender/pulls/105924 --- source/blender/makesrna/intern/rna_nodetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index e8fcb81c3d8..59e863a1107 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -6731,7 +6731,7 @@ static void def_cmp_map_range(StructRNA *srna) prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); - RNA_def_property_ui_text(prop, "Clamp", "Clamp result of the node to 0.0 to 1.0 range"); + RNA_def_property_ui_text(prop, "Clamp", "Clamp the result of the node to the target range"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); }