Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#950 - always make sure there's a keyframe when drawing #1211

Merged
merged 3 commits into from May 2, 2019

Conversation

Projects
None yet
2 participants
@CandyFace
Copy link
Member

commented Apr 16, 2019

Fixes #950

#950 - ignore input with drawing tools when keyframe is not sane
- updated isKeyframeSane with check to verify draw_on_empty_frame_action
@scribblemaniac
Copy link
Member

left a comment

This PR currently introduces a bug with the automatic create new keyframe behavior that needs to be addressed before merging. There may need to be further discussion about how the automatic duplicate frame option should behave when there is no explicit previous keyframe.

Show resolved Hide resolved core_lib/src/interface/scribblearea.cpp Outdated
Show resolved Hide resolved core_lib/src/interface/scribblearea.cpp Outdated

@scribblemaniac scribblemaniac referenced this pull request Apr 19, 2019

Merged

Bugfixes 2 #1213

@scribblemaniac scribblemaniac added the bug label Apr 19, 2019

Make sure there's always a frame to paint on
- This reworks the whole handleDrawingOnEmptyFrame by always making sure there's a frame to paint on. No matter which frame frame is selected, the user can always expect to draw on the canvas. If the first frame is empty and the action is "draw on previous keyframe" then a keyframe will be created. The same will happen for "duplicate previous keyframe" in case there's none. This should also eliminate other checks that requires there to be a keyframe because there will always be one now.

@CandyFace CandyFace requested a review from scribblemaniac Apr 19, 2019

@CandyFace

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2019

I've reworked the PR... basically based on what you said @scribblemaniac , I agree that it's better if we always allow the user to draw on the canvas instead of ignoring their input.

The new logic makes sure that if you draw on the canvas while there is no previous keyframe, then one will be created for you. This is true for both "drawing on previous keyframe" and "duplicate previous keyframe"

@CandyFace CandyFace changed the title #950 - ignore input with drawing tools when keyframe is not sane #950 - always make sure there's a keyframe when drawing Apr 19, 2019

@scribblemaniac
Copy link
Member

left a comment

I made a small suggestion, but overall this is good now. I like the new solution, it simplifies many things!

Show resolved Hide resolved core_lib/src/interface/scribblearea.cpp

@scribblemaniac scribblemaniac added this to the 0.6.4 milestone May 2, 2019

@scribblemaniac

This comment has been minimized.

Copy link
Member

commented May 2, 2019

I am merging this now with only one reviewer due to our current limited resources and imminent v0.6.4 release.

@scribblemaniac scribblemaniac merged commit 858bae7 into pencil2d:master May 2, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.