1 files changed, 11 insertions, 9 deletions

diff --git a/source/blender/compositor/operations/COM_TransformOperation.h b/source/blender/compositor/operations/COM_TransformOperation.h
index 480998a0207..3c5584a1bea 100644
--- a/source/blender/compositor/operations/COM_TransformOperation.h
+++ b/source/blender/compositor/operations/COM_TransformOperation.h
@@ -30,15 +30,14 @@ class TransformOperation : public MultiThreadedOperation {
   constexpr static int DEGREE_INPUT_INDEX = 3;
   constexpr static int SCALE_INPUT_INDEX = 4;
 
-  float scale_center_x_;
-  float scale_center_y_;
-  float rotate_center_x_;
-  float rotate_center_y_;
   float rotate_cosine_;
   float rotate_sine_;
-  float translate_x_;
-  float translate_y_;
-  float constant_scale_;
+  int translate_x_;
+  int translate_y_;
+  float scale_;
+  rcti scale_canvas_;
+  rcti rotate_canvas_;
+  rcti translate_canvas_;
 
   /* Set variables. */
   PixelSampler sampler_;
@@ -46,6 +45,7 @@ class TransformOperation : public MultiThreadedOperation {
   float translate_factor_x_;
   float translate_factor_y_;
   bool invert_;
+  Size2f max_scale_canvas_size_;
 
  public:
   TransformOperation();
@@ -71,16 +71,18 @@ class TransformOperation : public MultiThreadedOperation {
     invert_ = value;
   }
 
+  void set_scale_canvas_max_size(Size2f size);
+
   void init_data() override;
   void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
   void update_memory_buffer_partial(MemoryBuffer *output,
                                     const rcti &area,
                                     Span<MemoryBuffer *> inputs) override;
 
+  void determine_canvas(const rcti &preferred_area, rcti &r_area) override;
+
  private:
-  /** Translate -> Rotate -> Scale. */
   void transform(BuffersIterator<float> &it, const MemoryBuffer *input_img);
-  /** Scale -> Rotate -> Translate. */
   void transform_inverted(BuffersIterator<float> &it, const MemoryBuffer *input_img);
 };