diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-05 11:53:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-05 11:53:34 +0300 |
commit | 2f700b828049fe5b2d1d0f3d4bc24f37de59e1a2 (patch) | |
tree | 61ca874de1fc1ea2a22b4c0604864fe66a8831a7 /source/blender | |
parent | a4fac21fc5a2e5e3c816884da6499f931dfe6dd1 (diff) |
GPU_immediate_util: missed last commit
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_brush.c | 4 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screendump.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_uv.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_graph_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_immediate_util.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate_util.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 6 |
13 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index bfa5d089fb0..5e72ec5f39f 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -970,11 +970,11 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customda /* Inner Ring: Light color for action of the brush */ /* TODO: toggle between add and remove? */ immUniformColor4ub(255, 255, 255, 200); - imm_draw_lined_circle(pos, x, y, brush->size, 40); + imm_draw_circle_wire(pos, x, y, brush->size, 40); /* Outer Ring: Dark color for contrast on light backgrounds (e.g. gray on white) */ immUniformColor3ub(30, 30, 30); - imm_draw_lined_circle(pos, x, y, brush->size + 1, 40); + imm_draw_circle_wire(pos, x, y, brush->size + 1, 40); immUnbindProgram(); diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 3e5d82f002c..db1a51ea4e6 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1858,7 +1858,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr) setlinestyle(6); /* TODO: handle line stipple in shader */ immUniformColor4ub(255, 100, 100, 200); - imm_draw_lined_circle(pos, x, y, p->radius, 40); + imm_draw_circle_wire(pos, x, y, p->radius, 40); immUnbindProgram(); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 99db2747033..643470dd3cf 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1478,7 +1478,7 @@ void ui_draw_but_UNITVEC(uiBut *but, uiWidgetColors *wcol, const rcti *rect) glEnable(GL_BLEND); glEnable(GL_LINE_SMOOTH); - imm_draw_lined_circle(pos, 0.0f, 0.0f, 1.0f, 32); + imm_draw_circle_wire(pos, 0.0f, 0.0f, 1.0f, 32); glDisable(GL_BLEND); glDisable(GL_LINE_SMOOTH); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 114200676ed..c595bc607a3 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2274,7 +2274,7 @@ static void ui_hsv_cursor(float x, float y) glEnable(GL_BLEND); glEnable(GL_LINE_SMOOTH); immUniformColor3f(0.0f, 0.0f, 0.0f); - imm_draw_lined_circle(pos, x, y, 3.0f * U.pixelsize, 12); + imm_draw_circle_wire(pos, x, y, 3.0f * U.pixelsize, 12); glDisable(GL_BLEND); glDisable(GL_LINE_SMOOTH); @@ -2394,7 +2394,7 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, const rcti * glEnable(GL_LINE_SMOOTH); immUniformColor3ubv((unsigned char *)wcol->outline); - imm_draw_lined_circle(pos, centx, centy, radius, tot); + imm_draw_circle_wire(pos, centx, centy, radius, tot); immUnbindProgram(); @@ -4165,8 +4165,8 @@ void ui_draw_pie_center(uiBlock *block) immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor4ubv((unsigned char *)btheme->tui.wcol_pie_menu.outline); - imm_draw_lined_circle(pos, 0.0f, 0.0f, pie_radius_internal, subd); - imm_draw_lined_circle(pos, 0.0f, 0.0f, pie_radius_external, subd); + imm_draw_circle_wire(pos, 0.0f, 0.0f, pie_radius_internal, subd); + imm_draw_circle_wire(pos, 0.0f, 0.0f, pie_radius_external, subd); immUnbindProgram(); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 6bf9b320e59..fed8ed60ecc 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2719,7 +2719,7 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata) glEnable(GL_LINE_SMOOTH); glEnable(GL_BLEND); - imm_draw_lined_circle(pos, (float)x, (float)y, pe_brush_size_get(scene, brush), 40); + imm_draw_circle_wire(pos, (float)x, (float)y, pe_brush_size_get(scene, brush), 40); glDisable(GL_BLEND); glDisable(GL_LINE_SMOOTH); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 25255c79390..55e3573495a 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -465,7 +465,7 @@ static void screencast_draw_cursor(bContext *UNUSED(C), int x, int y, void *UNUS imm_draw_circle_fill(pos, (float)x, (float)y, 20, 40); immUniformColor4ub(255, 255, 255, 128); - imm_draw_lined_circle(pos, (float)x, (float)y, 20, 40); + imm_draw_circle_wire(pos, (float)x, (float)y, 20, 40); immUnbindProgram(); diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index e97f457494c..de629faac32 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1133,11 +1133,11 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) /* draw brush outline */ if (ups->stroke_active && BKE_brush_use_size_pressure(scene, brush)) { /* inner at full alpha */ - imm_draw_lined_circle(pos, translation[0], translation[1], final_radius * ups->size_pressure_value, 40); + imm_draw_circle_wire(pos, translation[0], translation[1], final_radius * ups->size_pressure_value, 40); /* outer at half alpha */ immUniformColor3fvAlpha(outline_col, outline_alpha * 0.5f); } - imm_draw_lined_circle(pos, translation[0], translation[1], final_radius, 40); + imm_draw_circle_wire(pos, translation[0], translation[1], final_radius, 40); immUnbindProgram(); diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 578b4f8a234..b6bed36b2c6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -218,7 +218,7 @@ static void brush_drawcursor_uvsculpt(bContext *C, int x, int y, void *UNUSED(cu glEnable(GL_LINE_SMOOTH); glEnable(GL_BLEND); - imm_draw_lined_circle(pos, (float)x, (float)y, size, 40); + imm_draw_circle_wire(pos, (float)x, (float)y, size, 40); glDisable(GL_BLEND); glDisable(GL_LINE_SMOOTH); diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index b6802d9205b..139757e7b68 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -122,7 +122,7 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track, gpuTranslate2f(scene_framenr, val); gpuScale2f(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize); - imm_draw_lined_circle(data->pos, 0, 0, 0.7, 8); + imm_draw_circle_wire(data->pos, 0, 0, 0.7, 8); gpuPopMatrix(); } diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index cecda174614..414687636b0 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -710,7 +710,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); imm_cpack(color_act); - imm_draw_lined_circle(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32); + imm_draw_circle_wire(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32); immUnbindProgram(); } diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.h index 77c5701480b..730b31ed277 100644 --- a/source/blender/gpu/GPU_immediate_util.h +++ b/source/blender/gpu/GPU_immediate_util.h @@ -29,7 +29,7 @@ void imm_cpack(unsigned int x); -void imm_draw_lined_circle(unsigned pos, float x, float y, float radius, int nsegments); +void imm_draw_circle_wire(unsigned pos, float x, float y, float radius, int nsegments); void imm_draw_circle_fill(unsigned pos, float x, float y, float radius, int nsegments); /* use this version when VertexFormat has a vec3 position */ diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c index cf23385ac04..cc874acbe52 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.c +++ b/source/blender/gpu/intern/gpu_immediate_util.c @@ -65,7 +65,7 @@ static void imm_draw_circle(PrimitiveType prim_type, unsigned pos, float x, floa * \param radius The circle's radius. * \param nsegments The number of segments to use in drawing (more = smoother). */ -void imm_draw_lined_circle(unsigned pos, float x, float y, float rad, int nsegments) +void imm_draw_circle_wire(unsigned pos, float x, float y, float rad, int nsegments) { imm_draw_circle(PRIM_LINE_LOOP, pos, x, y, rad, nsegments); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 495d72a45c3..ca8498a1a9a 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3228,10 +3228,10 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd } /* draw circles on top */ - imm_draw_lined_circle(pos, 0.0f, 0.0f, r1, 40); - imm_draw_lined_circle(pos, 0.0f, 0.0f, r2, 40); + imm_draw_circle_wire(pos, 0.0f, 0.0f, r1, 40); + imm_draw_circle_wire(pos, 0.0f, 0.0f, r2, 40); if (rmin > 0.0f) - imm_draw_lined_circle(pos, 0.0, 0.0f, rmin, 40); + imm_draw_circle_wire(pos, 0.0, 0.0f, rmin, 40); immUnbindProgram(); BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi); |