From 7f580d073443e88086a08b49fd1bea7b9c6774c8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 8 Dec 2009 19:27:19 +0000
Subject: transforming metastrips didnt move effects within them & remove
 warning

---
 source/blender/editors/include/ED_armature.h        | 21 +++++++++++----------
 .../editors/transform/transform_conversions.c       |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'source')

diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 74f1f7e3b83..9d35121032c 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -27,22 +27,23 @@
 #ifndef ED_ARMATURE_H
 #define ED_ARMATURE_H
 
-struct bContext;
-struct Scene;
-struct Object;
+struct bArmature;
 struct Base;
+struct bContext;
 struct Bone;
-struct bArmature;
 struct bPoseChannel;
-struct wmOperator;
-struct wmKeyConfig;
+struct DerivedMesh;
+struct IDProperty;
 struct ListBase;
-struct View3D;
-struct ViewContext;
+struct MeshDeformModifierData;
+struct Object;
 struct RegionView3D;
+struct Scene;
 struct SK_Sketch;
-struct IDProperty;
-struct MeshDeformModifierData;
+struct View3D;
+struct ViewContext;
+struct wmKeyConfig;
+struct wmOperator;
 
 typedef struct EditBone
 {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 9e154bc4db6..a81c262dd64 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -2371,7 +2371,7 @@ void flushTransSeq(TransInfo *t)
 
 		switch (tdsq->sel_flag) {
 		case SELECT:
-			if (seq->type != SEQ_META && seq_tx_test(seq)) /* for meta's, their children move */
+			if (seq->type != SEQ_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
 				seq->start= new_frame - tdsq->start_offset;
 
 			if (seq->depth==0) {
-- 
cgit v1.2.3