[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50852] trunk/blender/source/blender/ blenkernel/intern: - Corrected movie clip length computation

[Sergey Sharybin]

Revision: 50852
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50852
Author:   nazgul
Date:     2012-09-24 15:27:04 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
- Corrected movie clip length computation
- Ignore clip's offset for movie clip sequencer strip

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-09-24 15:26:59 UTC (rev 50851)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-09-24 15:27:04 UTC (rev 50852)
@@ -292,11 +292,11 @@
 			clip->len = framenr + 1;
 		}
 		else {
-			for (;; ) {
+			for (;;) {
 				get_sequence_fname(clip, framenr, name);
 
 				if (!BLI_exists(name)) {
-					clip->len = framenr + 1;
+					clip->len = framenr;
 					break;
 				}
 

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-24 15:26:59 UTC (rev 50851)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-24 15:27:04 UTC (rev 50852)
@@ -2186,7 +2186,7 @@
 
 	memset(&user, 0, sizeof(MovieClipUser));
 	
-	BKE_movieclip_user_set_frame(&user, nr + seq->anim_startofs);
+	BKE_movieclip_user_set_frame(&user, nr + seq->anim_startofs + seq->clip->start_frame);
 
 	user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL;