[Bf-blender-cvs] [47a629b972f] tmp-workbench-rewrite2: Merge branch 'master' into tmp-workbench-rewrite2

[Miguel Pozo]

Commit: 47a629b972f78e3008bed6680c170922fdbef12b
Author: Miguel Pozo
Date:   Tue Jan 10 16:02:00 2023 +0100
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rB47a629b972f78e3008bed6680c170922fdbef12b

Merge branch 'master' into tmp-workbench-rewrite2

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



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

diff --cc source/blender/gpu/intern/gpu_texture_private.hh
index 20543391691,344ec911adc..1b3c04a78f9
--- a/source/blender/gpu/intern/gpu_texture_private.hh
+++ b/source/blender/gpu/intern/gpu_texture_private.hh
@@@ -41,10 -41,10 +41,10 @@@ typedef enum eGPUTextureType 
    GPU_TEXTURE_CUBE_ARRAY = (GPU_TEXTURE_CUBE | GPU_TEXTURE_ARRAY),
  } eGPUTextureType;
  
 -ENUM_OPERATORS(eGPUTextureType, GPU_TEXTURE_CUBE_ARRAY)
 +ENUM_OPERATORS(eGPUTextureType, GPU_TEXTURE_BUFFER)
  
  /* Format types for samplers within the shader.
-  * This covers the sampler format type permutations within GLSL/MSL.*/
+  * This covers the sampler format type permutations within GLSL/MSL. */
  typedef enum eGPUSamplerFormat {
    GPU_SAMPLER_TYPE_FLOAT = 0,
    GPU_SAMPLER_TYPE_INT = 1,
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 6654961f740,4c9568d9228..09f03706c00
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -652,9 -652,6 +652,8 @@@ typedef struct UserDef_Experimental 
    char use_override_templates;
    char enable_eevee_next;
    char use_sculpt_texture_paint;
-   char use_realtime_compositor;
 +  char enable_workbench_next;
-   char _pad[6];
++  char _pad[7];
    /** `makesdna` does not allow empty structs. */
  } UserDef_Experimental;