archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

NLA Transform Bugfixes:

Browse Source 
* Scaling NLA-strips now resets their scale setting correctly at all times
* Added safe-guards against negative scaling being created through the use of the transform tools.

Note: at scale 0 or thereabouts, there will still be a little blip, when keyframes are scaled as if scale were 1.0f. It's quite harmless.
This commit is contained in:
Joshua Leung
2008-05-11 13:07:40 +00:00
parent 2d96d1189f
commit 97e72570d1
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/src/transform_conversions.c
View File

@@ -2726,9 +2726,10 @@ static void createTransNlaData(TransInfo *t)
if (base->object->action) {
/* exclude if strip is selected too */
for (strip=base->object->nlastrips.first; strip; strip=strip->next) {
if (strip->flag & ACTSTRIP_SELECT)
if (strip->flag & ACTSTRIP_SELECT) {
if (strip->act == base->object->action)
break;
}
}
if (strip==NULL) {
cfra = get_action_frame(base->object, CFRA);
@@ -2790,9 +2791,10 @@ static void createTransNlaData(TransInfo *t)
if (base->object->action) {
/* exclude if strip that active action belongs to is selected too */
for (strip=base->object->nlastrips.first; strip; strip=strip->next) {
if (strip->flag & ACTSTRIP_SELECT)
if (strip->flag & ACTSTRIP_SELECT) {
if (strip->act == base->object->action)
break;
}
}
/* can include if no strip found */