[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10900] trunk/blender/source/blender/src/ editnla.c: == NLA Editor ==
Joshua Leung
aligorith at gmail.com
Sat Jun 9 09:24:08 CEST 2007
Revision: 10900
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10900
Author: aligorith
Date: 2007-06-09 09:24:08 +0200 (Sat, 09 Jun 2007)
Log Message:
-----------
== NLA Editor ==
Yet another commit to fix Shift-S snapping for keyframes. The code to snap an Object's IPO block's keyframes to the current frame should be evaluated before the expanded/collapsed status of said object is evaluated.
Modified Paths:
--------------
trunk/blender/source/blender/src/editnla.c
Modified: trunk/blender/source/blender/src/editnla.c
===================================================================
--- trunk/blender/source/blender/src/editnla.c 2007-06-09 05:56:43 UTC (rev 10899)
+++ trunk/blender/source/blender/src/editnla.c 2007-06-09 07:24:08 UTC (rev 10900)
@@ -395,9 +395,16 @@
bActionStrip *strip;
for (base=G.scene->base.first; base; base=base->next) {
+ /* object has ipo - these keyframes should be able to be snapped, even if strips are collapsed */
+ if (base->object->ipo) {
+ snap_ipo_keys(base->object->ipo, snap_mode);
+ }
+
+ /* object is collapsed - action and nla strips not shown/editable */
if (base->object->nlaflag & OB_NLA_COLLAPSED)
continue;
+ /* snap action strips */
for (strip = base->object->nlastrips.last; strip; strip=strip->prev) {
if (strip->flag & ACTSTRIP_SELECT) {
if (snap_mode==1) {
@@ -422,11 +429,6 @@
}
}
- /* object has ipo */
- if (base->object->ipo) {
- snap_ipo_keys(base->object->ipo, snap_mode);
- }
-
/* object has action */
if (base->object->action) {
ListBase act_data = {NULL, NULL};
More information about the Bf-blender-cvs
mailing list