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 /intern/cycles/blender/blender_viewport.cpp | |
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 'intern/cycles/blender/blender_viewport.cpp')
-rw-r--r-- | intern/cycles/blender/blender_viewport.cpp | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp new file mode 100644 index 00000000000..7af509aab09 --- /dev/null +++ b/intern/cycles/blender/blender_viewport.cpp @@ -0,0 +1,59 @@ +/* + * Copyright 2019 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "blender_viewport.h" + +CCL_NAMESPACE_BEGIN + +BlenderViewportParameters::BlenderViewportParameters() + : use_scene_world(true), + use_scene_lights(true), + studiolight_rotate_z(0.0f), + studiolight_background_alpha(1.0f), + studiolight_path(ustring()) +{ +} + +BlenderViewportParameters::BlenderViewportParameters(BL::SpaceView3D &b_v3d) + : BlenderViewportParameters() +{ + /* We only copy the parameters if we are in look dev mode. otherwise + * defaults are being used. These defaults mimic normal render settings */ + if (b_v3d && b_v3d.shading().type() == BL::View3DShading::type_RENDERED) { + use_scene_world = b_v3d.shading().use_scene_world_render(); + use_scene_lights = b_v3d.shading().use_scene_lights_render(); + if (!use_scene_world) { + studiolight_rotate_z = b_v3d.shading().studiolight_rotate_z(); + studiolight_background_alpha = b_v3d.shading().studiolight_background_alpha(); + studiolight_path = b_v3d.shading().selected_studio_light().path(); + } + } +} + +/* Check if two instances are different. */ +const bool BlenderViewportParameters::modified(const BlenderViewportParameters &other) const +{ + return use_scene_world != other.use_scene_world || use_scene_lights != other.use_scene_lights || + studiolight_rotate_z != other.studiolight_rotate_z || + studiolight_background_alpha != other.studiolight_background_alpha || + studiolight_path != other.studiolight_path; +} + +const bool BlenderViewportParameters::custom_viewport_parameters() const +{ + return !(use_scene_world && use_scene_lights); +} + +CCL_NAMESPACE_END |