March 1, 2015, 09:54 (GMT) |
Merge branch 'master' into asset-experiments |
February 28, 2015, 20:51 (GMT) |
I18n: Do not skip Polish anymore, translation work has started on it. |
February 28, 2015, 14:52 (GMT) |
Replaced use of the HDF5 Alembic backend by Ogawa. Ogawa is replacing HDF5 as the new de-facto standard. Selecting either should be more formalized and a user option, for now it's just hardcoded. |
February 28, 2015, 14:21 (GMT) |
Merge branch 'master' into asset-experiments |
February 28, 2015, 13:34 (GMT) |
NLA Drawing Tweaks * Strips in muted tracks are also drawn with dotted borders now to make it clearer that they are not contributing. TODO: * Perhaps dotted should be used for protected, and opacity for muted instead? |
February 28, 2015, 13:34 (GMT) |
Tweaks for NLA and newly added Action Stash Tracks * Do not make Action Stash Tracks or their strips active/selected * Lock the track to prevent accidental editing/adding of other strips * Prevent strips from being added into locked tracks by the pushdown operator. This is mainly to prevent pushdown actions from getting into the stash tracks. |
February 28, 2015, 13:34 (GMT) |
Action Editor: "New Action" operator now stashes old actions, and is used by default again This commit modifies the "New Action" operator to always stash the old action before it creates a new one. As a result, the old active action will now have a proper user of sorts after the new one is created, preventing previously created actions from being lost. Now that the New operator does this, it can be used for the Action Editor header AND NLA Editor (Animation Data Panel -> Active Action) again. The "stash and create" operator is somewhat redundant at this point as a result. |
February 28, 2015, 13:34 (GMT) |
Action Editor WIP: Adding new actions in Action Editor now uses the "stash and create new" operator In constrast to the old "new" operator, this operator will stash the existing action in the stack to prevent it from being lost. This situation isn't totally ideal yet, since the NLA Editor still calls the old method. |
February 28, 2015, 13:34 (GMT) |
Action Stashing: Don't allow an action to get stashed more than once |
February 28, 2015, 13:34 (GMT) |
Reshuffle code |
February 28, 2015, 13:34 (GMT) |
Code Cleanup: Deduplicate logic for getting AnimData block associated with Action Editor modes |
February 28, 2015, 13:34 (GMT) |
Code cleanup: Split off the creation and setting logic for new actions into different functions This is also just as prep for the next step |
February 28, 2015, 13:34 (GMT) |
UI Tweak: Display labels for Push Down and Stash I'm still not sure which version is better, but I suspect that with the labels, this might help users figure this out more than if they were just unlabelled icon buttons... |
February 28, 2015, 13:34 (GMT) |
Code Cleanup: Separate out the logic for stashing actions into a separate function |
February 28, 2015, 13:34 (GMT) |
Action Editor: Stash Action Operator This operator (the snowflake icon, beside the pushdown button on the Action Editor header) adds the currently active action to the NLA stack in a muted track, then creates + loads a new action ready to be populated with new keyframes. Since the NLA is being used to hang on to all the actions here, no actions are getting lost. Usage Notes (there will be some additional tweaks to make this nicer): * To preview different actions that have been "stashed", simply click the "Solo" toggle for the track containing the action in question. Playing back the NLA will now show the stashed track * To edit a previously stashed action - simply enter tweakmode on it in the NLA while the "Solo" toggle is enabled. Todo: * Add some more operators here to polish up the Action <-> NLA bridge to make the layered and stash workflows smoother. Examples include some tools to easily switch between the different actions layers in the stack, as well as making it easier to get out of tweakmode (and sync up the action lengths) * Review and cleanup the behaviour of the "new" operator here to avoid the old problems that users were running into * After the next release - Implement the full Action Libraries functionality, with ways to bridge the stashed strips over to a full-blown library. |
February 28, 2015, 13:34 (GMT) |
NLA: Auto-Blends option is no longer enabled on all newly added strips This may be put back again later, but currently, this is a bit too trigger-happy to have it on. It tends to mess up results more than it helps. |
February 28, 2015, 13:34 (GMT) |
Fix for NLA Solo/Mute behaviour The Solo and Mute functionality for the NLA system should really be mutually exclusive features. They both affect whether a given track applies or not. The only difference is that the Solo option mutes all the others, while the Mute only does this on a per track basis. Before this fix, muting a strip and then making it solo meant that the solo'd track would not play at all, which isn't really what we want. |
February 28, 2015, 13:34 (GMT) |
Fix for previous commit: Pop up a warning in cases where the operator will refuse to do anything |
February 28, 2015, 13:34 (GMT) |
Action Editor: Added "Push Down" operator to send the current action on to the NLA Stack This commit exposes the "Push Down" button/functionality found in the NLA Editor to the Action Editor, so that actions can be added NLA Stack from here too. The main point of this for now is to make the whole layered-animation workflow nicer more efficient, but not requiring the second editor be visible in common cases. It also conveniently sets things up for the next few changes (already hinted at here)... |
February 28, 2015, 13:34 (GMT) |
Code Cleanup: Clarify some comments regarding usercount management (Note for the uninitiated looking at the diffs: this is very much *not* what you're probably thinking right now, if you're looking at the line in act_new_exec()) |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021