Revision: 38488
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38488
Author: nazgul
Date: 2011-07-18 18:57:00 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================
Disallow changing trasnformation mode to rotation.
It's not supported for markers and it lead to crashes.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
2011-07-18 18:45:05 UTC (rev 38487)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
2011-07-18 18:57:00 UTC (rev 38488)
@@ -96,6 +96,7 @@
#define CTX_AUTOCONFIRM 32
#define CTX_BMESH 64
#define CTX_NDOF 128
+#define CTX_VIDEOCLIP 256
/* Standalone call to get the transformation center corresponding to the
current situation
* returns 1 if successful, 0 otherwise (usually means there's no selection)
Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2011-07-18 18:45:05 UTC (rev 38487)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2011-07-18 18:57:00 UTC (rev 38488)
@@ -628,7 +628,7 @@
break;
case TFM_MODAL_ROTATE:
/* only switch when... */
- if(!(t->options & CTX_TEXTURE)) {
+ if(!(t->options & CTX_TEXTURE) && !(t->options
& CTX_VIDEOCLIP)) {
if( ELEM4(t->mode, TFM_ROTATION,
TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) {
resetTransRestrictions(t);
@@ -1587,6 +1587,7 @@
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_VIDEOCLIP;
}
else
unit_m3(t->spacemtx);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
