[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47621] trunk/blender/source/blender: Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled .

[Sergey Sharybin]

Revision: 47621
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47621
Author:   nazgul
Date:     2012-06-08 17:16:32 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled.

Also corrected some typos in movieclip.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-06-08 17:02:02 UTC (rev 47620)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-06-08 17:16:32 UTC (rev 47621)
@@ -314,7 +314,7 @@
 		/* cache for undistorted shot */
 		float principal[2];
 		float k1, k2, k3;
-		short undistoriton_used;
+		short undistortion_used;
 
 		int proxy;
 		short render_flag;
@@ -627,7 +627,7 @@
 		if (!check_undistortion_cache_flags(clip))
 			return NULL;
 	}
-	else if (cache->postprocessed.undistoriton_used)
+	else if (cache->postprocessed.undistortion_used)
 		return NULL;
 
 	IMB_refImBuf(cache->postprocessed.ibuf);
@@ -660,11 +660,11 @@
 	if (need_undistortion_postprocess(user, flag)) {
 		copy_v2_v2(cache->postprocessed.principal, camera->principal);
 		copy_v3_v3(&cache->postprocessed.k1, &camera->k1);
-		cache->postprocessed.undistoriton_used = TRUE;
+		cache->postprocessed.undistortion_used = TRUE;
 		postproc_ibuf = get_undistorted_ibuf(clip, NULL, ibuf);
 	}
 	else {
-		cache->postprocessed.undistoriton_used = FALSE;
+		cache->postprocessed.undistortion_used = FALSE;
 	}
 
 	if (postprocess_flag) {

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-08 17:02:02 UTC (rev 47620)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-08 17:16:32 UTC (rev 47621)
@@ -522,6 +522,7 @@
 
 	/* fields to check if cache is still valid */
 	int framenr, start_frame;
+	short render_size, render_flag;
 } SpaceClipDrawContext;
 
 int ED_space_clip_texture_buffer_supported(SpaceClip *sc)
@@ -559,6 +560,8 @@
 	 * so not changed image buffer pointer means unchanged image content */
 	need_rebind |= context->texture_ibuf != ibuf;
 	need_rebind |= context->framenr != sc->user.framenr;
+	need_rebind |= context->render_size != sc->user.render_size;
+	need_rebind |= context->render_flag != sc->user.render_flag;
 	need_rebind |= context->start_frame != clip->start_frame;
 
 	if (need_rebind) {
@@ -614,6 +617,8 @@
 		context->image_width = ibuf->x;
 		context->image_height = ibuf->y;
 		context->framenr = sc->user.framenr;
+		context->render_size = sc->user.render_size;
+		context->render_flag = sc->user.render_flag;
 		context->start_frame = clip->start_frame;
 	}
 	else {