diff options
author | Antonioya <blendergit@gmail.com> | 2018-12-15 19:21:47 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-12-15 19:21:47 +0300 |
commit | 351f537fa832c50971454af304a071c096427e71 (patch) | |
tree | 3746ee812d1104dd6cdc13549ea80ee7e16b00dc /source/blender/editors/gpencil/drawgpencil.c | |
parent | f9917a8d431f5480d9a5d58dfcf84863911f3bf2 (diff) |
GP: New Curve primitive and other primitive improvements
This commit adds support for new curve tool and adds more functionalities to the existing primitives, including new handles, editing, stroke thickness curve, noise, preview of the real stroke, etc.
Thanks to @charlie for his great contribution to this improvement.
Diffstat (limited to 'source/blender/editors/gpencil/drawgpencil.c')
-rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index b44c9105e10..c16ea84ec81 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -1430,63 +1430,6 @@ void ED_gp_draw_interpolation(const bContext *C, tGPDinterpolate *tgpi, const in glDisable(GL_BLEND); } -/* draw interpolate strokes (used only while operator is running) */ -void ED_gp_draw_primitives(const bContext *C, tGPDprimitive *tgpi, const int type) -{ - tGPDdraw tgpw; - ARegion *ar = CTX_wm_region(C); - RegionView3D *rv3d = ar->regiondata; - - /* if idle, do not draw */ - if (tgpi->flag == 0) { - return; - } - - Object *obact = CTX_data_active_object(C); - Depsgraph *depsgraph = CTX_data_depsgraph(C); - - float color[4]; - UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, color); - color[3] = 0.6f; - int dflag = 0; - /* if 3d stuff, enable flags */ - if (type == REGION_DRAW_POST_VIEW) { - dflag |= (GP_DRAWDATA_ONLY3D | GP_DRAWDATA_NOSTATUS); - } - - tgpw.rv3d = rv3d; - tgpw.depsgraph = depsgraph; - tgpw.ob = obact; - tgpw.gpd = tgpi->gpd; - tgpw.offsx = 0; - tgpw.offsy = 0; - tgpw.winx = tgpi->ar->winx; - tgpw.winy = tgpi->ar->winy; - tgpw.dflag = dflag; - - /* turn on alpha-blending */ - GPU_blend(true); - /* calculate parent position */ - ED_gpencil_parent_location(depsgraph, obact, tgpi->gpd, tgpi->gpl, tgpw.diff_mat); - if (tgpi->gpf) { - tgpw.gps = tgpi->gpf->strokes.first; - if (tgpw.gps->totpoints > 0) { - tgpw.gpl = tgpi->gpl; - tgpw.gpf = tgpi->gpf; - tgpw.t_gpf = tgpi->gpf; - - tgpw.lthick = tgpi->gpl->line_change; - tgpw.opacity = 1.0; - copy_v4_v4(tgpw.tintcolor, color); - tgpw.onion = true; - tgpw.custonion = true; - - gp_draw_strokes(&tgpw); - } - } - GPU_blend(false); -} - /* wrapper to draw strokes for filling operator */ void ED_gp_draw_fill(tGPDdraw *tgpw) { |