Commit: 8b5ce6e843eae4d379403986472475732f94e758
Author: Campbell Barton
Date:   Fri Jun 8 06:31:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8b5ce6e843eae4d379403986472475732f94e758

Transform: fix non-3D view editmode assert

===================================================================

M       source/blender/editors/transform/transform_conversions.c

===================================================================

diff --git a/source/blender/editors/transform/transform_conversions.c 
b/source/blender/editors/transform/transform_conversions.c
index d4a01214d29..0bc03880096 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -8448,6 +8448,7 @@ void createTransData(bContext *C, TransInfo *t)
        }
        else if (t->spacetype == SPACE_ACTION) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
 
                createTransActionData(C, t);
                countAndCleanTransDataContainer(t);
@@ -8460,17 +8461,23 @@ void createTransData(bContext *C, TransInfo *t)
        }
        else if (t->spacetype == SPACE_NLA) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
+
                createTransNlaData(C, t);
                countAndCleanTransDataContainer(t);
        }
        else if (t->spacetype == SPACE_SEQ) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
+
                t->num.flag |= NUM_NO_FRACTION; /* sequencer has no use for 
floating point transformations */
                createTransSeqData(C, t);
                countAndCleanTransDataContainer(t);
        }
        else if (t->spacetype == SPACE_IPO) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
+
                createTransGraphEditData(C, t);
                countAndCleanTransDataContainer(t);
 
@@ -8482,6 +8489,7 @@ void createTransData(bContext *C, TransInfo *t)
        }
        else if (t->spacetype == SPACE_NODE) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
 
                createTransNodeData(C, t);
                countAndCleanTransDataContainer(t);
@@ -8494,6 +8502,8 @@ void createTransData(bContext *C, TransInfo *t)
        }
        else if (t->spacetype == SPACE_CLIP) {
                t->flag |= T_POINTS | T_2D_EDIT;
+               t->obedit_type = -1;
+
                if (t->options & CTX_MOVIECLIP) {
                        createTransTrackingData(C, t);
                        countAndCleanTransDataContainer(t);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to