[Bf-blender-cvs] [e6fe10c] soc-2016-multiview: minor fix for secondary clip open button

Tianwei Shen noreply at git.blender.org
Wed Jul 20 13:45:47 CEST 2016


Commit: e6fe10c044bd43db27dce37a93edc9ed8f731509
Author: Tianwei Shen
Date:   Wed Jul 20 19:45:04 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBe6fe10c044bd43db27dce37a93edc9ed8f731509

minor fix for secondary clip open button

know issue: cannot desync primary clip and secondary clip

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

M	source/blender/editors/space_clip/clip_editor.c

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

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index dbc4c2e..a757bbe 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -656,7 +656,7 @@ void ED_space_clip_set_secondary_clip(bContext *C, bScreen *screen, SpaceClip *s
 								old_clip_visible = true;
 						}
 						else {
-							if (cur_sc->secondary_clip == old_clip || cur_sc->clip == NULL) {
+							if (cur_sc->secondary_clip == old_clip || cur_sc->secondary_clip == NULL) {
 								cur_sc->secondary_clip = secondary_clip;
 							}
 						}
@@ -672,7 +672,7 @@ void ED_space_clip_set_secondary_clip(bContext *C, bScreen *screen, SpaceClip *s
 	}
 
 	if (C)
-		WM_event_add_notifier(C, NC_MOVIECLIP | NA_SELECTED, sc->clip);
+		WM_event_add_notifier(C, NC_MOVIECLIP | NA_SELECTED, sc->secondary_clip);
 }
 
 /* ******** masking editing functions ******** */




More information about the Bf-blender-cvs mailing list