Merge branch 'blender-v2.81-release'

3 files changed, 1 insertions, 31 deletions

diff --git a/source/blender/makesdna/DNA_gpu_types.h b/source/blender/makesdna/DNA_gpu_types.h
index 8cab90b0a46..7d56baf86a4 100644
--- a/source/blender/makesdna/DNA_gpu_types.h
+++ b/source/blender/makesdna/DNA_gpu_types.h
@@ -24,6 +24,7 @@
 #ifndef __DNA_GPU_TYPES_H__
 #define __DNA_GPU_TYPES_H__
 
+/* Keep for 'Camera' versioning. */
 /** Properties for dof effect. */
 typedef struct GPUDOFSettings {
   /** Focal distance for depth of field. */
@@ -37,29 +38,4 @@ typedef struct GPUDOFSettings {
   int high_quality;
 } GPUDOFSettings;
 
-/** Properties for SSAO effect. */
-typedef struct GPUSSAOSettings {
-  float factor;
-  float color[3];
-  float distance_max;
-  float attenuation;
-  /** Ray samples, we use presets here for easy control instead of. */
-  int samples;
-  char _pad[4];
-} GPUSSAOSettings;
-
-typedef struct GPUFXSettings {
-  GPUDOFSettings *dof;
-  GPUSSAOSettings *ssao;
-  /** #eGPUFXFlags. */
-  char fx_flag;
-  char _pad[7];
-} GPUFXSettings;
-
-/* shaderfx enables */
-typedef enum eGPUFXFlags {
-  GPU_FX_FLAG_DOF = (1 << 0),
-  GPU_FX_FLAG_SSAO = (1 << 1),
-} eGPUFXFlags;
-
 #endif /* __DNA_GPU_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 8763f62b385..3794508d5a2 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -39,7 +39,6 @@ extern "C" {
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
 #include "DNA_freestyle_types.h"
-#include "DNA_gpu_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_material_types.h"
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 283c361cc56..7b832f1b646 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -38,7 +38,6 @@ struct wmTimer;
 #include "DNA_image_types.h"
 #include "DNA_object_types.h"
 #include "DNA_movieclip_types.h"
-#include "DNA_gpu_types.h"
 
 typedef struct RegionView3D {
 
@@ -301,10 +300,6 @@ typedef struct View3D {
   /** Actually only used to define the opacity of the grease pencil vertex in edit mode. */
   float vertex_opacity;
 
-  /* note, 'fx_settings.dof' is currently _not_ allocated,
-   * instead set (temporarily) from camera */
-  struct GPUFXSettings fx_settings;
-
   /* XXX deprecated? */
   /** Grease-Pencil Data (annotation layers). */
   struct bGPdata *gpd DNA_DEPRECATED;