griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Miguel Pozo
2024-02-08 17:38:09 +01:00
parent 25b71bc9c1 a8f29e8e36
commit cf27e0f3e1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/engines/eevee_next/eevee_instance.hh
View File

@@ -167,7 +167,10 @@ class Instance {
lookdev(*this),
light_probes(*this),
irradiance_cache(*this),
volume(*this, uniform_data.data.volumes){};
volume(*this, uniform_data.data.volumes)
{
BLI_assert_unreachable();
};
~Instance(){};
/* Render & Viewport. */

2
source/blender/draw/intern/draw_manager_c.cc
View File

@@ -3045,7 +3045,7 @@ void DRW_engines_register()
RE_engines_register(&DRW_engine_viewport_eevee_type);
/* Always register EEVEE Next so it can be used in background mode with `--factory-startup`.
* (Needed for tests). */
RE_engines_register(&DRW_engine_viewport_eevee_next_type);
// RE_engines_register(&DRW_engine_viewport_eevee_next_type);
RE_engines_register(&DRW_engine_viewport_workbench_type);