diff options
Diffstat (limited to 'source/blender/editors/gpencil/drawgpencil.c')
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index ed1835266d5..2b26f4a295d 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -34,19 +34,15 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" #include "DNA_gpencil_types.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "BKE_blender.h" #include "BKE_context.h" @@ -55,20 +51,15 @@ #include "BKE_sequencer.h" #include "BKE_utildefines.h" -#include "PIL_time.h" #include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "ED_gpencil.h" #include "ED_sequencer.h" -#include "ED_util.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "gpencil_intern.h" @@ -684,7 +675,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) zoom= (float)(SEQ_ZOOM_FAC(sseq->zoom)); if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) { /* XXX sequencer zoom should store it? */ - zoomx = zoom; // * ((float)G.scene->r.xasp / (float)G.scene->r.yasp); + zoomx = zoom; // * (G.scene->r.xasp / G.scene->r.yasp); zoomy = zoom; } else @@ -718,7 +709,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) /* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes */ -void draw_gpencil_2dview (bContext *C, short onlyv2d) +void draw_gpencil_view2d (bContext *C, short onlyv2d) { ScrArea *sa= CTX_wm_area(C); ARegion *ar= CTX_wm_region(C); @@ -744,7 +735,7 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d) /* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly * Note: this gets called twice - first time with only3d=1 to draw 3d-strokes, second time with only3d=0 for screen-aligned strokes */ -void draw_gpencil_3dview_ext (Scene *scene, ARegion *ar, short only3d) +void draw_gpencil_view3d_ext (Scene *scene, ARegion *ar, short only3d) { bGPdata *gpd; int dflag = 0; @@ -758,11 +749,11 @@ void draw_gpencil_3dview_ext (Scene *scene, ARegion *ar, short only3d) gp_draw_data(gpd, 0, 0, ar->winx, ar->winy, CFRA, dflag); } -void draw_gpencil_3dview (bContext *C, short only3d) +void draw_gpencil_view3d (bContext *C, short only3d) { ARegion *ar= CTX_wm_region(C); Scene *scene= CTX_data_scene(C); - draw_gpencil_3dview_ext(scene, ar, only3d); + draw_gpencil_view3d_ext(scene, ar, only3d); } /* ************************************************** */ |