[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47580] trunk/blender/source/blender/ editors: Remove unused ibuf argument from draw_gpencil_2dimage
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jun 7 19:57:50 CEST 2012
Revision: 47580
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47580
Author: nazgul
Date: 2012-06-07 17:57:49 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Remove unused ibuf argument from draw_gpencil_2dimage
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/include/ED_gpencil.h
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_image/image_draw.c
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-06-07 17:55:26 UTC (rev 47579)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2012-06-07 17:57:49 UTC (rev 47580)
@@ -669,7 +669,7 @@
// ............................
/* 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 @@
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 @@
{
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) {
Modified: trunk/blender/source/blender/editors/include/ED_gpencil.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_gpencil.h 2012-06-07 17:55:26 UTC (rev 47579)
+++ trunk/blender/source/blender/editors/include/ED_gpencil.h 2012-06-07 17:57:49 UTC (rev 47580)
@@ -76,7 +76,7 @@
/* ------------ 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);
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-07 17:55:26 UTC (rev 47579)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-07 17:57:49 UTC (rev 47580)
@@ -1457,7 +1457,6 @@
{
SpaceClip *sc = CTX_wm_space_clip(C);
MovieClip *clip = ED_space_clip(sc);
- ImBuf *ibuf;
if (!clip)
return;
@@ -1466,16 +1465,11 @@
/* 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 {
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c 2012-06-07 17:55:26 UTC (rev 47579)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c 2012-06-07 17:57:49 UTC (rev 47580)
@@ -564,16 +564,9 @@
{
/* 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... */
More information about the Bf-blender-cvs
mailing list