[Bf-blender-cvs] [6babbf5] master: Fix T39472: Changing Sequencer color space repeatedly changes movie strip's display gamma

Sergey Sharybin noreply at git.blender.org
Fri Mar 28 08:59:37 CET 2014


Commit: 6babbf59bcd297213305bd285be2171fc16e9613
Author: Sergey Sharybin
Date:   Fri Mar 28 13:58:39 2014 +0600
https://developer.blender.org/rB6babbf59bcd297213305bd285be2171fc16e9613

Fix T39472: Changing Sequencer color space repeatedly changes movie strip's display gamma

Issue was caused by the old color space settings being lurking around
seq->anim after the changes in color space settings.

===================================================================

M	source/blender/makesrna/intern/rna_color.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 408f99b..a55be8e 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -62,6 +62,7 @@
 #include "ED_node.h"
 
 #include "IMB_colormanagement.h"
+#include "IMB_imbuf.h"
 
 static int rna_CurveMapping_curves_length(PointerRNA *ptr)
 {
@@ -609,10 +610,24 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *UNUSED(bmain)
 			}
 
 			if (seq_found) {
+				if (seq->anim) {
+					IMB_free_anim(seq->anim);
+					seq->anim = NULL;
+				}
+
 				BKE_sequence_invalidate_cache(scene, seq);
 				BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
 			}
 			else {
+				SEQ_BEGIN(scene->ed, seq);
+				{
+					if (seq->anim) {
+						IMB_free_anim(seq->anim);
+						seq->anim = NULL;
+					}
+				}
+				SEQ_END;
+
 				BKE_sequencer_cache_cleanup();
 				BKE_sequencer_preprocessed_cache_cleanup();
 			}




More information about the Bf-blender-cvs mailing list