griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unused ibuf argument from draw_gpencil_2dimage

Browse Source 
It was used by sequencer only and it wasn't ported for a while already.
This change allows to save cahce lookup for image and clip editors.
This commit is contained in:
Sergey Sharybin
2012-06-07 17:57:49 +00:00
parent 49a5141cde
commit fd271f34fe
4 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/gpencil/drawgpencil.c
View File

@@ -669,7 +669,7 @@ static void gp_draw_data(bGPdata *gpd, int offsx, int offsy, int winx, int winy,
// ............................
/* draw grease-pencil sketches to specified 2d-view that uses ibuf corrections */
void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
void draw_gpencil_2dimage(bContext *C /* , ImBuf *ibuf */)
{
ScrArea *sa = CTX_wm_area(C);
ARegion *ar = CTX_wm_region(C);
@@ -678,8 +678,6 @@ void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
int offsx, offsy, sizex, sizey;
int dflag = GP_DRAWDATA_NOSTATUS;
/* check that we have grease-pencil stuff to draw */
if (ELEM(NULL, sa, ibuf)) return;
gpd = gpencil_data_get_active(C); // XXX
if (gpd == NULL) return;
@@ -706,7 +704,10 @@ void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
{
SpaceSeq *sseq = (SpaceSeq *)sa->spacedata.first;
float zoom, zoomx, zoomy;
/* check that we have grease-pencil stuff to draw */
if (ELEM(NULL, sa, ibuf)) return;
/* calculate accessory values */
zoom = (float)(SEQ_ZOOM_FAC(sseq->zoom));
if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {

2
source/blender/editors/include/ED_gpencil.h
View File

@@ -76,7 +76,7 @@ void ED_operatortypes_gpencil(void);
/* ------------ Grease-Pencil Drawing API ------------------ */
/* drawgpencil.c */
void draw_gpencil_2dimage(struct bContext *C, struct ImBuf *ibuf);
void draw_gpencil_2dimage(struct bContext *C /* , struct ImBuf *ibuf */);
void draw_gpencil_view2d(struct bContext *C, short onlyv2d);
void draw_gpencil_view3d(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, short only3d);

14
source/blender/editors/space_clip/clip_draw.c
View File

@@ -1457,7 +1457,6 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
{
SpaceClip *sc = CTX_wm_space_clip(C);
MovieClip *clip = ED_space_clip(sc);
ImBuf *ibuf;
if (!clip)
return;
@@ -1466,16 +1465,11 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
/* if manual calibration is used then grease pencil data is already
* drawed in draw_distortion */
if ((sc->flag & SC_MANUAL_CALIBRATION) == 0 || sc->mode != SC_MODE_DISTORTION) {
ibuf = ED_space_clip_get_buffer(sc);
glPushMatrix();
glMultMatrixf(sc->unistabmat);
draw_gpencil_2dimage(C);
if (ibuf) {
glPushMatrix();
glMultMatrixf(sc->unistabmat);
draw_gpencil_2dimage(C, ibuf);
IMB_freeImBuf(ibuf);
glPopMatrix();
}
glPopMatrix();
}
}
else {

9
source/blender/editors/space_image/image_draw.c
View File

@@ -564,16 +564,9 @@ void draw_image_grease_pencil(bContext *C, short onlyv2d)
{
/* draw in View2D space? */
if (onlyv2d) {
/* assume that UI_view2d_ortho(C) has been called... */
SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C);
void *lock;
ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock);
/* draw grease-pencil ('image' strokes) */
//if (sima->flag & SI_DISPGP)
draw_gpencil_2dimage(C, ibuf);
ED_space_image_release_buffer(sima, lock);
draw_gpencil_2dimage(C);
}
else {
/* assume that UI_view2d_restore(C) has been called... */