[Bf-blender-cvs] [eaf9ccb] soc-2016-multiview: fix bug in chaning mode

Tianwei Shen noreply at git.blender.org
Fri Aug 5 18:19:37 CEST 2016


Commit: eaf9ccb22acc8f89474e568e67833678be907422
Author: Tianwei Shen
Date:   Sat Aug 6 00:17:47 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBeaf9ccb22acc8f89474e568e67833678be907422

fix bug in chaning mode

- error: when 'tracking' mode is clicked, it also enter into 'correspondence' mode.
the if-else logic was wrong

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

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 a63c577..f260c74 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -728,12 +728,15 @@ void ED_clip_update_correspondence_mode(bContext *C, SpaceClip *sc)
 	}
 	BLI_assert(find_draw_region == true && ar != NULL);
 
+	printf("sc mode: %d\n", sc->mode);
+	printf("alignment : %d\n", ar->alignment);
 	/* some rules related to changing between correspondence mode and other mode*/
 	if (ar->regiontype != RGN_TYPE_WINDOW) {
 		return;
 	}
 	else if (sc->mode != SC_MODE_CORRESPONDENCE && ar->alignment == RGN_ALIGN_VSPLIT) {
 		///* Exit split-view */
+        printf("exit split-view\n");
 		ScrArea *sa = CTX_wm_area(C);
 		ARegion *arn;
 
@@ -755,7 +758,8 @@ void ED_clip_update_correspondence_mode(bContext *C, SpaceClip *sc)
 	else if (ar->next) {
 		return;		// Only last region can be splitted
 	}
-	else {
+	else if (sc->mode == SC_MODE_CORRESPONDENCE) {
+        printf("enter split-view\n");
 		/* Enter split-view */
 		ScrArea *sa = CTX_wm_area(C);




More information about the Bf-blender-cvs mailing list