[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25223] trunk/blender/source/blender/ editors: transforming metastrips didnt move effects within them & remove warning

Campbell Barton ideasman42 at gmail.com
Tue Dec 8 20:27:19 CET 2009


Revision: 25223
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25223
Author:   campbellbarton
Date:     2009-12-08 20:27:19 +0100 (Tue, 08 Dec 2009)

Log Message:
-----------
transforming metastrips didnt move effects within them & remove warning

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_armature.h
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/include/ED_armature.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_armature.h	2009-12-08 19:08:35 UTC (rev 25222)
+++ trunk/blender/source/blender/editors/include/ED_armature.h	2009-12-08 19:27:19 UTC (rev 25223)
@@ -27,22 +27,23 @@
 #ifndef ED_ARMATURE_H
 #define ED_ARMATURE_H
 
+struct bArmature;
+struct Base;
 struct bContext;
-struct Scene;
-struct Object;
-struct Base;
 struct Bone;
-struct bArmature;
 struct bPoseChannel;
-struct wmOperator;
-struct wmKeyConfig;
+struct DerivedMesh;
+struct IDProperty;
 struct ListBase;
+struct MeshDeformModifierData;
+struct Object;
+struct RegionView3D;
+struct Scene;
+struct SK_Sketch;
 struct View3D;
 struct ViewContext;
-struct RegionView3D;
-struct SK_Sketch;
-struct IDProperty;
-struct MeshDeformModifierData;
+struct wmKeyConfig;
+struct wmOperator;
 
 typedef struct EditBone
 {

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-12-08 19:08:35 UTC (rev 25222)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-12-08 19:27:19 UTC (rev 25223)
@@ -2371,7 +2371,7 @@
 
 		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) {





More information about the Bf-blender-cvs mailing list