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:
authorCampbell Barton <ideasman42@gmail.com>2018-11-07 01:43:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-07 01:43:07 +0300
commitbc1c263a8ada7541b4de2544757b1a765ffab0b3 (patch)
tree97ad81a839dd475b158919d76d8bff8fa89ef341 /source/blender/editors
parentfb932bb52a65c147689f5940aa0f347066ba0547 (diff)
Cleanup: naming (inconsistent paint_mode term)
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_icons.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_ops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index cae7f2a05c4..79d0c9852de 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1759,7 +1759,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
}
else if (paint_mode != ePaintInvalid) {
items = BKE_paint_get_tool_enum_from_paintmode(paint_mode);
- const uint tool_offset = BKE_paint_get_brush_tool_offset_from_paint_mode(paint_mode);
+ const uint tool_offset = BKE_paint_get_brush_tool_offset_from_paintmode(paint_mode);
const int tool_type = *(char *)POINTER_OFFSET(br, tool_offset);
if (!items || !RNA_enum_icon_from_value(items, tool_type, &id->icon_id)) {
id->icon_id = 0;
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index a4da0789be3..be59d8e2c71 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -82,7 +82,7 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
br = BKE_brush_copy(bmain, br);
}
else {
- br = BKE_brush_add(bmain, "Brush", BKE_paint_object_mode_from_paint_mode(mode));
+ br = BKE_brush_add(bmain, "Brush", BKE_paint_object_mode_from_paintmode(mode));
id_us_min(&br->id); /* fake user only */
}