Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2021-05-27 12:16:40 +0300
committerSergey Sharybin <sergey@blender.org>2021-05-27 12:36:30 +0300
commit616b071c4fa42f4b412ac12aa41120f41b79ec51 (patch)
tree63839dc06e483ac86d2c3b8f61adf34e3ccf3981 /intern/cycles/blender/blender_viewport.h
parent15df83e9c910f620e4d1ab24f7175c7a2eae57b3 (diff)
Refactor: Naming in Cycles viewport methods
Makes it more explicit they operate on shading/light. Gives room to move more viewport related settings into this class and cover with specific or generic modification checks.
Diffstat (limited to 'intern/cycles/blender/blender_viewport.h')
-rw-r--r--intern/cycles/blender/blender_viewport.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h
index e73399ea6db..c588a5b8f87 100644
--- a/intern/cycles/blender/blender_viewport.h
+++ b/intern/cycles/blender/blender_viewport.h
@@ -29,6 +29,7 @@ CCL_NAMESPACE_BEGIN
class BlenderViewportParameters {
public:
+ /* Shader. */
bool use_scene_world;
bool use_scene_lights;
float studiolight_rotate_z;
@@ -39,8 +40,12 @@ class BlenderViewportParameters {
BlenderViewportParameters();
explicit BlenderViewportParameters(BL::SpaceView3D &b_v3d);
- bool modified(const BlenderViewportParameters &other) const;
- bool custom_viewport_parameters() const;
+ /* Check whether any of shading related settings are different from the given parameters. */
+ bool shader_modified(const BlenderViewportParameters &other) const;
+
+ /* Returns truth when a custom shader defined by the viewport is to be used instead of the
+ * regular background shader or scene light. */
+ bool use_custom_shader() const;
/* Retrieve the render pass type that needs to be displayed on the given `SpaceView3D`
* When the `b_v3d` parameter is not given `PASS_NONE` will be returned. */