blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

UI: "vertex keys" -> "shape keys" #104868

Closed
Philipp Oeser wants to merge 38 commits from lichtwerk:cleanup_rename_vertex_keys into main
pull from: lichtwerk:cleanup_rename_vertex_keys
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 38 Files Changed 89 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb5439b184 - Show all commits

6
source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
View File

@ -754,7 +754,7 @@ static void sculpt_mesh_update_strength(wmOperator *op,
float filter_strength = ss->filter_cache->start_filter_strength * -len * 0.001f * UI_DPI_FAC;
RNA_float_set(op->ptr, "strength", filter_strength);
}
void sculpt_mesh_filter_apply_with_history(bContext *C, wmOperator *op)
static void sculpt_mesh_filter_apply_with_history(bContext *C, wmOperator *op)
{
/* Event history is only stored for smooth and relax filters. */
if (!RNA_collection_length(op->ptr, "event_history")) {
@ -1024,12 +1024,10 @@ void SCULPT_mesh_filter_properties(wmOperatorType *ot)
RNA_def_property_flag(prop, PropertyFlag(int(PROP_HIDDEN) | int(PROP_SKIP_SAVE)));
}
void sculpt_mesh_ui_exec(bContext *C, wmOperator *op)
static void sculpt_mesh_ui_exec(bContext * /* C */, wmOperator *op)
{
uiLayout *layout = op->layout;
eSculptMeshFilterType filter_type = eSculptMeshFilterType(RNA_enum_get(op->ptr, "type"));
uiItemR(layout, op->ptr, "strength", 0, nullptr, ICON_NONE);
uiItemR(layout, op->ptr, "iteration_count", 0, nullptr, ICON_NONE);
uiItemR(layout, op->ptr, "orientation", 0, nullptr, ICON_NONE);