[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48237] trunk/blender/source/blender/ blenkernel/intern/movieclip.c: Fix crash sliding disabled marker from preview widget.
Sergey Sharybin
sergey.vfx at gmail.com
Sun Jun 24 16:16:40 CEST 2012
Revision: 48237
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48237
Author: nazgul
Date: 2012-06-24 14:16:40 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Fix crash sliding disabled marker from preview widget.
Reported by brothermechanic, thanks!
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/movieclip.c
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-06-24 14:08:34 UTC (rev 48236)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-06-24 14:16:40 UTC (rev 48237)
@@ -1067,6 +1067,9 @@
int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr);
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+ scopes->marker = marker;
+ scopes->track = track;
+
if (marker->flag & MARKER_DISABLED) {
scopes->track_disabled = TRUE;
}
@@ -1074,8 +1077,6 @@
ImBuf *ibuf = BKE_movieclip_get_ibuf(clip, user);
scopes->track_disabled = FALSE;
- scopes->marker = marker;
- scopes->track = track;
if (ibuf && (ibuf->rect || ibuf->rect_float)) {
ImBuf *search_ibuf;
More information about the Bf-blender-cvs
mailing list