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:
authorAntonio Vazquez <blendergit@gmail.com>2020-07-28 19:46:38 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-07-28 19:46:38 +0300
commite5e97d0fe0d4daddea15b47091aeb9922949fa09 (patch)
tree7fb06f1ea11c8b811451bc08e2f937ece52dacfa
parent814ca40c639c74c48ec5e5b1a078b3b9884a9fad (diff)
parentd8919d12f7cab90de920e633fd38104e2f62f3a8 (diff)
Merge branch 'blender-v2.90-release'
-rw-r--r--source/blender/shader_fx/intern/FX_shader_rim.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/shader_fx/intern/FX_shader_rim.c b/source/blender/shader_fx/intern/FX_shader_rim.c
index eaaa10af54c..82e1d151cb6 100644
--- a/source/blender/shader_fx/intern/FX_shader_rim.c
+++ b/source/blender/shader_fx/intern/FX_shader_rim.c
@@ -72,11 +72,11 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemR(layout, &ptr, "mask_color", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "mode", 0, IFACE_("Blend Mode"), ICON_NONE);
- /* Add the X, Z labels manually because offset is a #PROP_PIXEL. */
+ /* Add the X, Y labels manually because offset is a #PROP_PIXEL. */
col = uiLayoutColumn(layout, true);
PropertyRNA *prop = RNA_struct_find_property(&ptr, "offset");
uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Offset X"), ICON_NONE);
- uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Z"), ICON_NONE);
+ uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE);
shaderfx_panel_end(layout, &ptr);
}
@@ -91,11 +91,11 @@ static void blur_panel_draw(const bContext *C, Panel *panel)
uiLayoutSetPropSep(layout, true);
- /* Add the X, Z labels manually because blur is a #PROP_PIXEL. */
+ /* Add the X, Y labels manually because blur is a #PROP_PIXEL. */
col = uiLayoutColumn(layout, true);
PropertyRNA *prop = RNA_struct_find_property(&ptr, "blur");
uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Blur X"), ICON_NONE);
- uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Z"), ICON_NONE);
+ uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE);
uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE);
}