[Bf-blender-cvs] [315e51ad771] temp-gpu-image-engine: Made view override required.

[Jeroen Bakker]

Commit: 315e51ad771f411fc461cb80add15bab00ca1e3c
Author: Jeroen Bakker
Date:   Mon Dec 13 15:15:32 2021 +0100
Branches: temp-gpu-image-engine
https://developer.blender.org/rB315e51ad771f411fc461cb80add15bab00ca1e3c

Made view override required.

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

M	source/blender/draw/engines/image/image_engine.cc
M	source/blender/draw/engines/image/image_space.hh
M	source/blender/draw/engines/image/image_space_image.hh
M	source/blender/draw/engines/image/image_space_node.hh

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

diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index 12b03690275..ad02adaa98c 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -88,11 +88,8 @@ class ImageEngine {
   {
     IMAGE_InstanceData *instance_data = vedata->instance_data;
     drawing_mode.cache_init(vedata);
-    instance_data->view = nullptr;
-    if (space->has_view_override()) {
-      const ARegion *region = draw_ctx->region;
-      instance_data->view = space->create_view_override(region);
-    }
+    const ARegion *region = draw_ctx->region;
+    instance_data->view = space->create_view_override(region);
   }
 
   void cache_populate()
diff --git a/source/blender/draw/engines/image/image_space.hh b/source/blender/draw/engines/image/image_space.hh
index 2c843713c57..1fd240b9a36 100644
--- a/source/blender/draw/engines/image/image_space.hh
+++ b/source/blender/draw/engines/image/image_space.hh
@@ -85,16 +85,8 @@ class AbstractSpaceAccessor {
                                 bool *r_owns_texture,
                                 GPUTexture **r_tex_tile_data) = 0;
 
-  /**
-   * Does this space override the view.
-   * When so this member should return true and the create_view_override must return the view to
-   * use during drawing.
-   */
-  virtual bool has_view_override() const = 0;
-
   /**
    * Override the view for drawing.
-   * Should match #has_view_override.
    */
   virtual DRWView *create_view_override(const ARegion *UNUSED(region)) = 0;
 
diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh
index 31df05ee318..9dbd0648b74 100644
--- a/source/blender/draw/engines/image/image_space_image.hh
+++ b/source/blender/draw/engines/image/image_space_image.hh
@@ -101,11 +101,6 @@ class SpaceImageAccessor : public AbstractSpaceAccessor {
     }
   }
 
-  bool has_view_override() const override
-  {
-    return true;
-  }
-
   DRWView *create_view_override(const ARegion *region) override
   {
     /* Setup a screen pixel view. The backdrop of the node editor doesn't follow the region. */
diff --git a/source/blender/draw/engines/image/image_space_node.hh b/source/blender/draw/engines/image/image_space_node.hh
index 3717d45f414..be2667879d4 100644
--- a/source/blender/draw/engines/image/image_space_node.hh
+++ b/source/blender/draw/engines/image/image_space_node.hh
@@ -54,11 +54,6 @@ class SpaceNodeAccessor : public AbstractSpaceAccessor {
     BKE_image_release_ibuf(image, ibuf, lock);
   }
 
-  bool has_view_override() const override
-  {
-    return true;
-  }
-
   DRWView *create_view_override(const ARegion *region) override
   {
     /* Setup a screen pixel view. The backdrop of the node editor doesn't follow the region. */