diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:20:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:21:45 +0300 |
| commit | ef8ab3b4c2aa4b709acf6b4c8263ceb6d6f515de (patch) | |
| tree | 888d2a58dbbe69c94a090668189a65b0ae1a8113 | |
| parent | 936d1cef6e6124a8f8f3ce50182afa2e1c947c6f (diff) | |
Fix issues after last 2.8 merge.
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 12 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 0d11bf80366..d327e270a35 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7358,7 +7358,7 @@ static int edbm_point_normals_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static bool point_normals_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop) +static bool point_normals_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data)) { const char *prop_id = RNA_property_identifier(prop); @@ -7380,7 +7380,7 @@ static void edbm_point_normals_ui(bContext *C, wmOperator *op) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* Main auto-draw call */ - uiDefAutoButsRNA(layout, &ptr, point_normals_draw_check_prop, '\0', false); + uiDefAutoButsRNA(layout, &ptr, point_normals_draw_check_prop, NULL, '\0', false); } void MESH_OT_point_normals(struct wmOperatorType *ot) @@ -7751,7 +7751,7 @@ static int edbm_average_normals_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static bool average_normals_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop) +static bool average_normals_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data)) { const char *prop_id = RNA_property_identifier(prop); const int average_type = RNA_enum_get(ptr, "average_type"); @@ -7777,7 +7777,7 @@ static void edbm_average_normals_ui(bContext *C, wmOperator *op) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* Main auto-draw call */ - uiDefAutoButsRNA(layout, &ptr, average_normals_draw_check_prop, '\0', false); + uiDefAutoButsRNA(layout, &ptr, average_normals_draw_check_prop, NULL, '\0', false); } void MESH_OT_average_normals(struct wmOperatorType *ot) @@ -7943,7 +7943,7 @@ static int edbm_normals_tools_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static bool normals_tools_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop) +static bool normals_tools_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data)) { const char *prop_id = RNA_property_identifier(prop); const int mode = RNA_enum_get(ptr, "mode"); @@ -7966,7 +7966,7 @@ static void edbm_normals_tools_ui(bContext *C, wmOperator *op) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* Main auto-draw call */ - uiDefAutoButsRNA(layout, &ptr, normals_tools_draw_check_prop, '\0', false); + uiDefAutoButsRNA(layout, &ptr, normals_tools_draw_check_prop, NULL, '\0', false); } void MESH_OT_normals_tools(struct wmOperatorType *ot) diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 1ada8b215c5..cf0753334db 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -233,7 +233,7 @@ static void bevel_mod_harden_normals(BevelModifierData *bmd, BMesh *bm, const fl static void bevel_fix_normal_shading_continuity(BevelModifierData *bmd, BMesh *bm) { const bool vertex_only = (bmd->flags & MOD_BEVEL_VERT) != 0; - if (bmd->value == 0 || bmd->clnordata.faceHash == NULL && vertex_only) + if (bmd->value == 0 || (bmd->clnordata.faceHash == NULL && vertex_only)) return; BM_mesh_normals_update(bm); |