[Bf-blender-cvs] [e0458a3ead2] master: Fix drawing order messed up by rB005626b8c6b4

Richard Antalik noreply at git.blender.org
Fri Mar 1 21:23:47 CET 2019


Commit: e0458a3ead24b3df3b29b37dbff9cd2b2bf0e359
Author: Richard Antalik
Date:   Fri Mar 1 12:23:15 2019 -0800
Branches: master
https://developer.blender.org/rBe0458a3ead24b3df3b29b37dbff9cd2b2bf0e359

Fix drawing order messed up by rB005626b8c6b4

When annotations enabled, image borders were drawn around whole area instead around preview image.

Reviewed by: Brecht

Differential revision: https://developer.blender.org/D4430

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

M	source/blender/editors/space_sequencer/sequencer_draw.c

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

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index aed5f338d39..31a4b15425c 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1431,14 +1431,14 @@ void sequencer_draw_preview(
 		}
 	}
 
-	if (draw_gpencil && show_imbuf) {
-		sequencer_draw_gpencil(C);
-	}
-
 	if (show_imbuf) {
 		sequencer_draw_borders(sseq, v2d, scene);
 	}
 
+	if (draw_gpencil && show_imbuf) {
+		sequencer_draw_gpencil(C);
+	}
+
 	/* TODO */
 	/* sequencer_draw_maskedit(C, scene, ar, sseq); */



More information about the Bf-blender-cvs mailing list