archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Merge branch 'main' into realtime-clock

Browse Source
This commit is contained in:
Lukas Tönne
2023-03-27 17:55:58 +02:00
parent 7e45dddca0 b27ffee8f3
commit 8ea027379d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/CMakeLists.txt
View File

@@ -800,6 +800,8 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
bf_blenlib bf_blenlib
bf_intern_ghost bf_intern_ghost
${PLATFORM_LINKLIBS} ${PLATFORM_LINKLIBS}
${IMATH_LIBRARIES}
${IMATH_LIBRARY}
) )
target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR})

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -6731,7 +6731,7 @@ static void def_cmp_map_range(StructRNA *srna)
prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); 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"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
} }