Revision: 27755
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27755
Author: aligorith
Date: 2010-03-26 01:25:14 +0100 (Fri, 26 Mar 2010)
Log Message:
-----------
Bugfix #21739: Extend in the NLA crashes (Ekey)
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_ops.c
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-03-25 21:43:36 UTC (rev 27754)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-03-26 00:25:14 UTC (rev 27755)
@@ -2600,7 +2600,7 @@
float xmouse, ymouse;
UI_view2d_region_to_view(&ac.ar->v2d, t->imval[0], t->imval[1],
&xmouse, &ymouse);
- t->frame_side= (xmouse > CFRA) ? 'R' : 'L'; // XXX use
t->frame_side
+ t->frame_side= (xmouse > CFRA) ? 'R' : 'L';
}
else {
/* normal transform - both sides of current frame are
considered */
@@ -2691,7 +2691,7 @@
tdn->handle= -1;
/* now, link the
transform data up to this data */
- if (t->mode ==
TFM_TRANSLATION) {
+ if (ELEM(t->mode,
TFM_TRANSLATION, TFM_TIME_EXTEND)) {
td->loc=
tdn->h1;
VECCOPY(td->iloc, tdn->h1);
@@ -2722,7 +2722,7 @@
tdn->handle=
(tdn->handle) ? 2 : 1;
/* now, link the
transform data up to this data */
- if (t->mode ==
TFM_TRANSLATION) {
+ if (ELEM(t->mode,
TFM_TRANSLATION, TFM_TIME_EXTEND)) {
td->loc=
tdn->h2;
VECCOPY(td->iloc, tdn->h2);
Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c
2010-03-25 21:43:36 UTC (rev 27754)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c
2010-03-26 00:25:14 UTC (rev 27755)
@@ -869,30 +869,29 @@
case SPACE_ACTION:
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", GKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
-
+
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
-
+
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
-
+
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", SKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_SCALE);
-
+
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", TKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_SLIDE);
break;
case SPACE_IPO:
km= WM_keymap_add_item(keymap, OP_TRANSLATION, GKEY,
KM_PRESS, 0, 0);
-
+
km= WM_keymap_add_item(keymap, OP_TRANSLATION,
EVT_TWEAK_S, KM_ANY, 0, 0);
-
- // XXX the 'mode' identifier here is not quite
right
+
km= WM_keymap_add_item(keymap,
"TRANSFORM_OT_transform", EKEY, KM_PRESS, 0, 0);
RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
-
+
km = WM_keymap_add_item(keymap, OP_ROTATION, RKEY,
KM_PRESS, 0, 0);
-
+
km = WM_keymap_add_item(keymap, OP_RESIZE, SKEY,
KM_PRESS, 0, 0);
break;
case SPACE_NLA:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
