[Bf-blender-cvs] [58b26198d20] tmp-workbench-rewrite2: Merge branch 'master' into tmp-workbench-rewrite2

[Miguel Pozo]

Commit: 58b26198d20ed2986b9d8a72dae7dc3f5dfa0f3f
Author: Miguel Pozo
Date:   Thu Nov 3 16:47:28 2022 +0100
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rB58b26198d20ed2986b9d8a72dae7dc3f5dfa0f3f

Merge branch 'master' into tmp-workbench-rewrite2

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



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

diff --cc release/scripts/startup/bl_ui/properties_particle.py
index 1fb28ba9b4d,8567ddb9372..0fbdb60900b
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@@ -239,7 -239,8 +239,8 @@@ class PARTICLE_PT_context_particles(Par
  
  class PARTICLE_PT_emission(ParticleButtonsPanel, Panel):
      bl_label = "Emission"
+     bl_translation_context = i18n_contexts.id_particlesettings
 -    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH'}
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH','BLENDER_WORKBENCH_NEXT'}
  
      @classmethod
      def poll(cls, context):
diff --cc source/blender/draw/CMakeLists.txt
index 4d17e6cbdd1,4010b491141..b2317025199
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -745,6 -732,22 +746,24 @@@ if(WITH_GTESTS
    endif()
  endif()
  
+ if(WITH_TBB)
+   add_definitions(-DWITH_TBB)
++
+   if(WIN32)
+     # TBB includes Windows.h which will define min/max macros
+     # that will collide with the stl versions.
+     add_definitions(-DNOMINMAX)
+   endif()
++
+   list(APPEND INC_SYS
+     ${TBB_INCLUDE_DIRS}
+   )
+ 
+   list(APPEND LIB
+     ${TBB_LIBRARIES}
+   )
+ endif()
+ 
  blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
  
  # Needed so we can use dna_type_offsets.h for defaults initialization.
diff --cc source/blender/gpu/CMakeLists.txt
index ddbfb51a51b,8da17720339..e7f4eda5c40
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -26,8 -27,8 +27,9 @@@ set(IN
    ../editors/include
  
    # For *_info.hh includes.
+   ../compositor/realtime_compositor
    ../draw/engines/eevee_next
 +  ../draw/engines/workbench
    ../draw/intern
  
    # For node muting stuff.