Commit: c237a48104c913e9583b8eeb1f7700c63e2c1d11
Author: Pablo Dobarro
Date: Tue Jan 5 17:53:50 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBc237a48104c913e9583b8eeb1f7700c63e2c1d11
Fix warnings and windows build
===================================================================
M source/blender/editors/sculpt_paint/sculpt_face_set.c
M source/blender/editors/sculpt_paint/sculpt_gradient.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c
b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index 7c676e40daa..270cf93d576 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -1473,7 +1473,7 @@ static void sculpt_face_set_extrude_id(Object *ob,
SculptSession *ss, const int
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
const int face_index = BM_elem_index_get(f);
const int face_set_id = ss->face_sets[face_index];
- BM_elem_select_set(bm, f, face_set_id == active_face_set_id);
+ BM_elem_select_set(bm, (BMElem *)f, face_set_id == active_face_set_id);
BM_elem_flag_set(f, BM_ELEM_TAG, face_set_id == active_face_set_id);
}
BM_mesh_select_flush(bm);
diff --git a/source/blender/editors/sculpt_paint/sculpt_gradient.c
b/source/blender/editors/sculpt_paint/sculpt_gradient.c
index a9bb389fab9..daa4680cd38 100644
--- a/source/blender/editors/sculpt_paint/sculpt_gradient.c
+++ b/source/blender/editors/sculpt_paint/sculpt_gradient.c
@@ -116,7 +116,7 @@ static void sculpt_gradient_apply_task_cb(void *__restrict
userdata,
break;
case SCULPT_GRADIENT_RADIAL: {
- const float dist = len_v2v2_int(projected_co,
gcontext->line_points[0]);
+ const float dist = len_v2v2(projected_co, gcontext->line_points[0]);
gradient_value = dist / gcontext->line_length;
} break;
case SCULPT_GRADIENT_ANGLE:
@@ -151,7 +151,7 @@ static int sculpt_gradient_update_exec(bContext *C,
wmOperator *op, const wmEven
gcontext->line_points[0][1] = RNA_int_get(op->ptr, "ystart");
gcontext->line_points[1][0] = RNA_int_get(op->ptr, "xend");
gcontext->line_points[1][1] = RNA_int_get(op->ptr, "yend");
- gcontext->line_length = len_v2v2_int(gcontext->line_points[0],
gcontext->line_points[1]);
+ gcontext->line_length = len_v2v2(gcontext->line_points[0],
gcontext->line_points[1]);
SculptThreadedTaskData data = {
.sd = sd,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
