diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-08-27 16:47:30 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-04 16:57:00 +0300 |
| commit | 68d1f091583168dce4e52d3c7378b9b0359e903a (patch) | |
| tree | 07adc7e5f8f353f4bab9f8cdd6f4fd783a13767c /source/blender/draw/engines/eevee/eevee_private.h | |
| parent | d3ab930c880e3a15cd7cd46355663e60119f6bde (diff) | |
Shading Modes: Material and Render Preview
This change implements the basics as described in {T68312} for the
shading modes.
* LookDev shading mode is renamed to Material Preview. It always uses Eevee as renderer, and is intended to provide a fast material preview suitable for texture painting, and texture and material setup.
* Rendered shading gains "Use Scene Lights" and "Use Scene World" options similar to current Material Preview. These will be enabled by default. When Use Scene World is turned off, HDRIs will be used for lighting instead. These options are available for EEVEE and Cycles.
* Renderers will be able to customize the shading settings panel and add additional settings.
Reviewed By: brecht, fclem
Differential Revision: https://developer.blender.org/D5612
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_private.h')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 3cdafee95a2..fefdaef970a 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -118,16 +118,19 @@ extern struct DrawEngineType draw_engine_eevee_type; } \ ((void)0) -#define OVERLAY_ENABLED(v3d) ((v3d) && (v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) -#define LOOK_DEV_MODE_ENABLED(v3d) ((v3d) && (v3d->shading.type == OB_MATERIAL)) +#define MATERIAL_PREVIEW_MODE_ENABLED(v3d) ((v3d) && (v3d->shading.type == OB_MATERIAL)) #define LOOK_DEV_OVERLAY_ENABLED(v3d) \ - (LOOK_DEV_MODE_ENABLED(v3d) && OVERLAY_ENABLED(v3d) && \ + ((v3d) && (v3d->shading.type == OB_MATERIAL) && ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) && \ (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV)) #define USE_SCENE_LIGHT(v3d) \ - ((!v3d) || (!LOOK_DEV_MODE_ENABLED(v3d)) || \ - ((LOOK_DEV_MODE_ENABLED(v3d) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHTS)))) + ((!v3d) || \ + ((v3d->shading.type == OB_MATERIAL) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHTS)) || \ + ((v3d->shading.type == OB_RENDER) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHTS_RENDER))) #define LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d) \ - (LOOK_DEV_MODE_ENABLED(v3d) && !(v3d->shading.flag & V3D_SHADING_SCENE_WORLD)) + ((v3d) && (((v3d->shading.type == OB_MATERIAL) && \ + ((v3d->shading.flag & V3D_SHADING_SCENE_WORLD) == 0)) || \ + ((v3d->shading.type == OB_RENDER) && \ + ((v3d->shading.flag & V3D_SHADING_SCENE_WORLD_RENDER) == 0)))) #define OCTAHEDRAL_SIZE_FROM_CUBESIZE(cube_size) \ ((int)ceilf(sqrtf((cube_size * cube_size) * 6.0f))) |