diff options
| author | Pablo Dobarro <pablodp606@gmail.com> | 2019-08-28 15:21:27 +0300 |
|---|---|---|
| committer | Pablo Dobarro <pablodp606@gmail.com> | 2019-08-28 15:21:27 +0300 |
| commit | dbea6c3507a0a94118429b012b3d088de7b0c26d (patch) | |
| tree | c8403eba40409113df706c0d6c6c7d02db998145 /source/blender/editors/sculpt_paint/paint_cursor.c | |
| parent | b386d5594a79d4963d17477021d2b2f3a64752cb (diff) | |
Fix symmetry in pose brush, add radius preview.sculpt-mode-features
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_cursor.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 8b010991e65..c49176d97dc 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1355,7 +1355,6 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) quat_to_mat4(cursor_rot_mat4, quat); GPU_matrix_push_projection(); - GPU_matrix_push(); ED_view3d_draw_setup_view(CTX_wm_window(C), CTX_data_depsgraph_pointer(C), CTX_data_scene(C), @@ -1364,6 +1363,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) NULL, NULL, NULL); + GPU_matrix_push(); if (brush->sculpt_tool == SCULPT_TOOL_GRAB && brush->flag2 & BRUSH_GRAB_ACTIVE_VERTEX) { if (vc.obact->sculpt) { @@ -1381,8 +1381,30 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) immUniformColor3fvAlpha(outline_col, outline_alpha); imm_draw_circle_wire_3d(pos3d, 0, 0, rds, 40); GPU_matrix_pop(); - GPU_matrix_pop_projection(); + if (brush->sculpt_tool == SCULPT_TOOL_POSE) { + float mat[3][3]; + float viewNormal[3]; + float viewDir[3] = {0.0f, 0.0f, 1.0f}; + + invert_m4_m4(vc.obact->imat, vc.obact->obmat); + copy_m3_m4(mat, vc.rv3d->viewinv); + mul_m3_v3(mat, viewDir); + copy_m3_m4(mat, vc.obact->imat); + mul_m3_v3(mat, viewDir); + normalize_v3_v3(viewNormal, viewDir); + + GPU_matrix_push(); + GPU_matrix_mul(cursor_mat4); + GPU_line_width(1.0f); + rotation_between_vecs_to_quat(quat, z_axis, viewNormal); + quat_to_mat4(cursor_rot_mat4, quat); + GPU_matrix_mul(cursor_rot_mat4); + imm_draw_circle_wire_3d(pos3d, 0, 0, rds, 40); + GPU_matrix_pop(); + } + + GPU_matrix_pop_projection(); wmWindowViewport(win); } else { |