From 616b071c4fa42f4b412ac12aa41120f41b79ec51 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 27 May 2021 11:16:40 +0200 Subject: 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. --- intern/cycles/blender/blender_viewport.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'intern/cycles/blender/blender_viewport.cpp') diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp index dbfee33fd59..6cd815d337b 100644 --- a/intern/cycles/blender/blender_viewport.cpp +++ b/intern/cycles/blender/blender_viewport.cpp @@ -56,8 +56,7 @@ BlenderViewportParameters::BlenderViewportParameters(BL::SpaceView3D &b_v3d) } } -/* Check if two instances are different. */ -bool BlenderViewportParameters::modified(const BlenderViewportParameters &other) const +bool BlenderViewportParameters::shader_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 || @@ -66,7 +65,7 @@ bool BlenderViewportParameters::modified(const BlenderViewportParameters &other) studiolight_path != other.studiolight_path; } -bool BlenderViewportParameters::custom_viewport_parameters() const +bool BlenderViewportParameters::use_custom_shader() const { return !(use_scene_world && use_scene_lights); } -- cgit v1.2.3