diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-08-22 16:44:44 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-08-22 16:44:44 +0300 |
| commit | 500e4d540a97ccbd8374f5596f74fc1e9ff65f08 (patch) | |
| tree | 3f3012fdac442d85c4b06d9d187b1dfe30d24038 /source/blender/makesrna/intern/rna_nodetree.c | |
| parent | ba74704c9acec7b0791a28fa7d1627cf1321ec5d (diff) | |
| parent | 0b2be4fbc348c22fe4140ee8517892c44996da34 (diff) | |
Merge branch 'blender-v3.3-release'
Conflicts:
release/scripts/startup/bl_ui/space_userpref.py
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 7d2fa8022dd..3ea06578fad 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4840,6 +4840,7 @@ static void def_math(StructRNA *srna) RNA_def_property_enum_sdna(prop, NULL, "custom1"); RNA_def_property_enum_items(prop, rna_enum_node_math_items); RNA_def_property_ui_text(prop, "Operation", ""); + RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_NODETREE); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update"); prop = RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE); @@ -6737,7 +6738,7 @@ static void def_cmp_set_alpha(StructRNA *srna) "REPLACE_ALPHA", 0, "Replace Alpha", - "Replace the input image's alpha channels by the alpha input value"}, + "Replace the input image's alpha channel by the alpha input value"}, {0, NULL, 0, NULL, NULL}, }; |