[Bf-blender-cvs] [58650a7599d] blender2.8: UI Tweak: Don't hide frame range indicators when preview range is shown

Joshua Leung noreply at git.blender.org
Tue Apr 24 19:18:38 CEST 2018


Commit: 58650a7599da9b4d56045ac599173fc92d3e5c68
Author: Joshua Leung
Date:   Tue Apr 24 17:37:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB58650a7599da9b4d56045ac599173fc92d3e5c68

UI Tweak: Don't hide frame range indicators when preview range is shown

After discussing with UI team, it's better to show both ranges, to make it
clearer that we have an "overlay" with the preview range.

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

M	source/blender/editors/animation/anim_draw.c

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

diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 623a3e82ecc..c70d3133c29 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -192,13 +192,6 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
 // TODO: Should we still show these when preview range is enabled?
 void ANIM_draw_framerange(Scene *scene, View2D *v2d)
 {
-	/* Don't draw frame range when preview range is enabled.
-	 * Otherwise we get nasty/confusing visual conflicts
-	 */
-	if (PRVRANGEON) {
-		return;
-	}
-	
 	/* draw darkened area outside of active timeline frame range */
 	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);



More information about the Bf-blender-cvs mailing list