[Bf-blender-cvs] [00aaee9994e] temp-vse-preview-transform: Address inlines

[Richard Antalik]

Commit: 00aaee9994efd192baeddd611a9a5ded98b481bc
Author: Richard Antalik
Date:   Fri Sep 10 09:55:01 2021 +0200
Branches: temp-vse-preview-transform
https://developer.blender.org/rB00aaee9994efd192baeddd611a9a5ded98b481bc

Address inlines

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_generics.c
M	source/blender/editors/transform/transform_gizmo_2d.c
M	source/blender/editors/transform/transform_ops.c

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 229db595c4d..f640b601213 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2685,12 +2685,9 @@ def km_sequencerpreview(params):
         ("sequencer.view_zoom_ratio", {"type": 'NUMPAD_8', "value": 'PRESS'},
          {"properties": [("ratio", 0.125)]}),
         ("sequencer.sample", {"type": params.action_mouse, "value": 'PRESS'}, None),
-        ("transform.translate", {"type": 'G', "value": 'PRESS'},
-         {"properties": [("sequencer_image", True)]}),
-        ("transform.resize", {"type": 'S', "value": 'PRESS'},
-         {"properties": [("sequencer_image", True)]}),
-        ("transform.rotate", {"type": 'R', "value": 'PRESS'},
-         {"properties": [("sequencer_image", True)]}),
+        ("transform.translate", {"type": 'G', "value": 'PRESS'}, None),
+        ("transform.resize", {"type": 'S', "value": 'PRESS'}, None),
+        ("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
     ])
 
     return keymap
@@ -7051,7 +7048,7 @@ def km_sequencer_editor_tool_move(params):
         {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
         {"items": [
             ("transform.translate", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("sequencer_image", True), ("release_confirm", True)]}),
+             {"properties": [("release_confirm", True)]}),
         ]},
     )
 
@@ -7062,7 +7059,7 @@ def km_sequencer_editor_tool_rotate(params):
         {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
         {"items": [
             ("transform.rotate", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("sequencer_image", True), ("release_confirm", True)]}),
+             {"properties": [("release_confirm", True)]}),
         ]},
     )
 
@@ -7073,7 +7070,7 @@ def km_sequencer_editor_tool_scale(params):
         {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
         {"items": [
             ("transform.resize", {"type": params.tool_tweak, "value": 'ANY'},
-             {"properties": [("sequencer_image", True), ("release_confirm", True)]}),
+             {"properties": [("release_confirm", True)]}),
         ]},
     )
 
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index f5979d6471b..41d6ac40534 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -631,13 +631,6 @@ static bNodeSocket *do_version_replace_float_size_with_vector(bNodeTree *ntree,
   return new_socket;
 }
 
-static bool seq_transform_origin_set(Sequence *seq, void *UNUSED(user_data))
-{
-  StripTransform *transform = seq->strip->transform;
-  transform->origin[0] = transform->origin[1] = 0.0f;
-  return true;
-}
-
 /* NOLINTNEXTLINE: readability-function-size */
 void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
 {
@@ -1106,10 +1099,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
       SequencerToolSettings *sequencer_tool_settings = SEQ_tool_settings_ensure(scene);
       sequencer_tool_settings->pivot_point = V3D_AROUND_CENTER_MEDIAN;
-
-      if (scene->ed != NULL) {
-        SEQ_for_each_callback(&scene->ed->seqbase, seq_transform_origin_set, NULL);
-      }
     }
   }
 }
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index b89b9c04450..e58e524e341 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1674,13 +1674,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
     }
   }
 
-  if ((prop = RNA_struct_find_property(op->ptr, "sequencer_image")) &&
-      RNA_property_is_set(op->ptr, prop)) {
-    if (RNA_property_boolean_get(op->ptr, prop)) {
-      options |= CTX_SEQUENCER_IMAGE;
-    }
-  }
-
   t->options = options;
 
   t->mode = mode;
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index f5b8b1c60a7..9846372e73e 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -346,6 +346,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
   else if (t->spacetype == SPACE_SEQ && region->regiontype == RGN_TYPE_PREVIEW) {
     t->view = &region->v2d;
     t->around = SEQ_tool_settings_pivot_point_get(t->scene);
+    t->options |= CTX_SEQUENCER_IMAGE;
   }
   else {
     if (region) {
diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c
index eb89c0011a8..599043ce1e0 100644
--- a/source/blender/editors/transform/transform_gizmo_2d.c
+++ b/source/blender/editors/transform/transform_gizmo_2d.c
@@ -391,11 +391,6 @@ static void gizmo2d_xform_setup(const bContext *C, wmGizmoGroup *gzgroup)
       }
     }
 
-    ScrArea *area = CTX_wm_area(C);
-    if (area->spacetype == SPACE_SEQ) {
-      RNA_boolean_set(ptr, "sequencer_image", true);
-    }
-
     RNA_boolean_set(ptr, "release_confirm", true);
   }
 
@@ -726,11 +721,6 @@ static void gizmo2d_resize_setup(const bContext *C, wmGizmoGroup *gzgroup)
       }
     }
     RNA_boolean_set(ptr, "release_confirm", true);
-
-    ScrArea *area = CTX_wm_area(C);
-    if (area->spacetype == SPACE_SEQ) {
-      RNA_boolean_set(ptr, "sequencer_image", true);
-    }
   }
 }
 
@@ -848,14 +838,9 @@ static void gizmo2d_rotate_setup(const bContext *C, wmGizmoGroup *gzgroup)
       WM_gizmo_set_color_highlight(gz, color);
     }
 
-    ScrArea *area = CTX_wm_area(C);
-
     /* Assign operator. */
     PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot_resize, NULL);
     RNA_boolean_set(ptr, "release_confirm", true);
-    if (area->spacetype == SPACE_SEQ) {
-      RNA_boolean_set(ptr, "sequencer_image", true);
-    }
   }
 }
 
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 5cea7ac669e..9638ec8750e 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -735,10 +735,6 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
                            "Forces the use of Auto Merge and Split");
     RNA_def_property_flag(prop, PROP_HIDDEN);
   }
-
-  prop = RNA_def_boolean(
-      ot->srna, "sequencer_image", 0, "Edit Sequencer Image", "Edit sequencer image position");
-  RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }
 
 static void TRANSFORM_OT_translate(struct wmOperatorType *ot)