[Bf-blender-cvs] [cfefc5d] master: Fix T38987 Dope sheet is inoperable with "view slected" when nothing is selected.
Bastien Montagne
noreply at git.blender.org
Thu Mar 6 14:19:24 CET 2014
Commit: cfefc5d0d4e6e704333936a295d6ffa45122fb1b
Author: Bastien Montagne
Date: Thu Mar 6 14:17:26 2014 +0100
https://developer.blender.org/rBcfefc5d0d4e6e704333936a295d6ffa45122fb1b
Fix T38987 Dope sheet is inoperable with "view slected" when nothing is selected.
Code was unconditionnaly setting view's xmin and xmax, even when it was aborting afterward.
===================================================================
M source/blender/editors/space_action/action_edit.c
===================================================================
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index e2ca45b..4c2cb16 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -368,7 +368,7 @@ static int actkeys_viewall(bContext *C, const bool only_sel, const bool only_xax
{
bAnimContext ac;
View2D *v2d;
- float extra;
+ float extra, min, max;
bool found;
/* get editor data */
@@ -377,11 +377,14 @@ static int actkeys_viewall(bContext *C, const bool only_sel, const bool only_xax
v2d = &ac.ar->v2d;
/* set the horizontal range, with an extra offset so that the extreme keys will be in view */
- found = get_keyframe_extents(&ac, &v2d->cur.xmin, &v2d->cur.xmax, only_sel);
+ found = get_keyframe_extents(&ac, &min, &max, only_sel);
if (only_sel && (found == false))
return OPERATOR_CANCELLED;
-
+
+ v2d->cur.xmin = min;
+ v2d->cur.xmax = max;
+
extra = 0.1f * BLI_rctf_size_x(&v2d->cur);
v2d->cur.xmin -= extra;
v2d->cur.xmax += extra;
More information about the Bf-blender-cvs
mailing list