Commit: 40bb0902ab501345bed47d9049d99de0175a6668
Author: Richard Antalik
Date: Sun Aug 29 21:16:57 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rB40bb0902ab501345bed47d9049d99de0175a6668
Fix unsaved change
===================================================================
M source/blender/editors/transform/transform.h
===================================================================
diff --git a/source/blender/editors/transform/transform.h
b/source/blender/editors/transform/transform.h
index f36bb124ac1..8d606a8a12e 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -94,13 +94,9 @@ typedef enum {
/** When transforming object's, adjust the object data so it stays in the
same place. */
CTX_OBMODE_XFORM_OBDATA = (1 << 13),
/** Transform object parents without moving their children. */
-<<<<<<< HEAD
- CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 13),
/** Enable edge scrolling in 2D views */
CTX_VIEW2D_EDGE_PAN = (1 << 14),
-=======
CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 14),
->>>>>>> VSE: Use transform operator in preview
} eTContext;
/** #TransInfo.flag */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
