[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47209] trunk/blender/source/blender/ editors/transform: minor transform change to stay in sync with mask branch

Campbell Barton ideasman42 at gmail.com
Wed May 30 09:38:33 CEST 2012


Revision: 47209
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47209
Author:   campbellbarton
Date:     2012-05-30 07:38:33 +0000 (Wed, 30 May 2012)
Log Message:
-----------
minor transform change to stay in sync with mask branch

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2012-05-30 07:34:25 UTC (rev 47208)
+++ trunk/blender/source/blender/editors/transform/transform.c	2012-05-30 07:38:33 UTC (rev 47209)
@@ -1594,7 +1594,6 @@
 	else if (t->spacetype == SPACE_CLIP) {
 		unit_m3(t->spacemtx);
 		t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
-		t->options |= CTX_MOVIECLIP;
 	}
 	else
 		unit_m3(t->spacemtx);

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2012-05-30 07:34:25 UTC (rev 47208)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2012-05-30 07:38:33 UTC (rev 47209)
@@ -1106,6 +1106,12 @@
 		t->view = &ar->v2d;
 		t->around = sipo->around;
 	}
+	else if (t->spacetype==SPACE_CLIP) {
+		SpaceClip *sclip = sa->spacedata.first;
+
+		if (ED_space_clip_show_trackedit(sclip))
+			t->options |= CTX_MOVIECLIP;
+	}
 	else {
 		if (ar) {
 			// XXX for now, get View2D  from the active region




More information about the Bf-blender-cvs mailing list