diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-13 20:05:40 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-03-13 20:05:40 +0300 |
commit | 5a0efc9c8b5ad991109c97d52d476d8c071a78ac (patch) | |
tree | e5c8290bc613ef8eea923d0983cb51512c4b1ce7 /source/blender/modifiers/intern | |
parent | 1ca7821b15f3883121552495436142814c73fbb7 (diff) | |
parent | 91dbc28363e5450f241eb9696aaca29075c01d20 (diff) |
Merge branch 'master' into temp-abc-features
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ui_common.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ui_common.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 9450a444042..b19caefae29 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -94,7 +94,8 @@ Mesh *doEdgeSplit(const Mesh *mesh, EdgeSplitModifierData *emd) BM_mesh_edgesplit(bm, false, true, false); - /* BM_mesh_validate(bm); */ /* for troubleshooting */ + /* Uncomment for troubleshooting. */ + // BM_mesh_validate(bm); result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh); BM_mesh_free(bm); diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c index 90652c180c6..eddf4bd03e1 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.c +++ b/source/blender/modifiers/intern/MOD_ui_common.c @@ -63,7 +63,7 @@ static void modifier_reorder(bContext *C, Panel *panel, int new_index) WM_operator_properties_create_ptr(&props_ptr, ot); RNA_string_set(&props_ptr, "modifier", md->name); RNA_int_set(&props_ptr, "index", new_index); - WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr); + WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr, NULL); WM_operator_properties_free(&props_ptr); } diff --git a/source/blender/modifiers/intern/MOD_ui_common.h b/source/blender/modifiers/intern/MOD_ui_common.h index 16e9dd25253..6548a897be9 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.h +++ b/source/blender/modifiers/intern/MOD_ui_common.h @@ -51,8 +51,8 @@ struct PanelType *modifier_panel_register(struct ARegionType *region_type, /** * Add a child panel to the parent. * - * \note To create the panel type's idname, it appends the \a name argument to the \a parent's - * idname. + * \note To create the panel type's #PanelType.idname, + * it appends the \a name argument to the \a parent's `idname`. */ struct PanelType *modifier_subpanel_register(struct ARegionType *region_type, const char *name, |