[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36020] trunk/blender: Bugfix [#26792] blender crash when scaling action strip in NLA

[Joshua Leung]

Revision: 36020
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36020
Author:   aligorith
Date:     2011-04-05 11:04:00 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
Bugfix [#26792] blender crash when scaling action strip in NLA

Two part bug:
Part 1) NLA Editor menu was calling wrong operator
Part 2) r35829 broke NLA scaling, since it only checked that the
transform mode used was allowed in the Action Editor (probably
confused by Part 1)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35829

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_nla.py
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_nla.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_nla.py	2011-04-05 09:33:28 UTC (rev 36019)
+++ trunk/blender/release/scripts/startup/bl_ui/space_nla.py	2011-04-05 11:04:00 UTC (rev 36020)
@@ -188,7 +188,7 @@
         layout.column()
         layout.operator("transform.translate", text="Grab/Move")
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
-        # layout.operator("transform.resize", text="Scale")  # crashes [#26792]
+        layout.operator("transform.transform", text="Scale").mode= 'TIME_SCALE'
 
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-04-05 09:33:28 UTC (rev 36019)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-04-05 11:04:00 UTC (rev 36020)
@@ -5793,8 +5793,10 @@
 {
 	int center[2];
 
-	/* this tool is only really available in the Action Editor... */
-	if (t->spacetype != SPACE_ACTION) {
+	/* this tool is only really available in the Action Editor
+	 * AND NLA Editor (for strip scaling)
+	 */
+	if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA) == 0) {
 		t->state = TRANS_CANCEL;
 	}
 

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-04-05 09:33:28 UTC (rev 36019)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-04-05 11:04:00 UTC (rev 36020)
@@ -2613,6 +2613,7 @@
 								unit_m3(td->smtx);
 							}
 							else {
+								/* time scaling only needs single value */
 								td->val= &tdn->h1[0];
 								td->ival= tdn->h1[0];
 							}
@@ -2644,6 +2645,7 @@
 								unit_m3(td->smtx);
 							}
 							else {
+								/* time scaling only needs single value */
 								td->val= &tdn->h2[0];
 								td->ival= tdn->h2[0];
 							}
@@ -2664,7 +2666,7 @@
 			}
 		}
 	}
-
+	
 	/* cleanup temp list */
 	BLI_freelistN(&anim_data);
 }