Merging r47572 through r47580 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 18:08:57 +0000 (18:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 18:08:57 +0000 (18:08 +0000)
1  2 
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/transform/transform_conversions.c

index 3f3bacfabdf18db0ba6a7a79307dc0a86c57f733,cca72e7469a0f059891592d85e4c3fd2a233a628..9332413b33bca7910918ca7af3dcfc8f25d053fd
@@@ -1460,28 -1465,11 +1459,23 @@@ void clip_draw_grease_pencil(bContext *
                /* 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);
-                       if (ibuf) {
-                               glPushMatrix();
-                               glMultMatrixf(sc->unistabmat);
+                       glPushMatrix();
+                       glMultMatrixf(sc->unistabmat);
 +
-                               if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
-                                       MovieTrackingTrack *track = BKE_tracking_active_track(&sc->clip->tracking);
++                      if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
++                              MovieTrackingTrack *track = BKE_tracking_active_track(&sc->clip->tracking);
 +
-                                       if (track) {
-                                               int framenr = sc->user.framenr;
-                                               MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, framenr);
++                              if (track) {
++                                      int framenr = sc->user.framenr;
++                                      MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, framenr);
 +
-                                               glTranslatef(marker->pos[0], marker->pos[1], 0.0f);
-                                       }
++                                      glTranslatef(marker->pos[0], marker->pos[1], 0.0f);
 +                              }
++                      }
 +
-                               draw_gpencil_2dimage(C, ibuf);
+                       draw_gpencil_2dimage(C);
  
-                               IMB_freeImBuf(ibuf);
-                               glPopMatrix();
-                       }
+                       glPopMatrix();
                }
        }
        else {