BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Implement Viewport render with material preview #56

Merged
Bogdan Nagirniak merged 22 commits from BLEN-421 into hydra-render 2023-06-30 09:03:28 +02:00
Conversation 1 Commits 22 Files Changed 7 +3 -7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d471339d2 - Show all commits

10
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc
View File

@ -426,8 +426,7 @@ void BlenderSceneDelegate::check_updates()
bool do_update_visibility = false; bool do_update_visibility = false;
bool do_update_world = false; bool do_update_world = false;
if (set_world_shading_settings(view3d)) if (set_world_shading_settings(view3d)) {
{
do_update_world = true; do_update_world = true;
} }
@ -672,8 +671,7 @@ bool BlenderSceneDelegate::set_light_shading_settings(View3D const *view3d)
{ {
bool ret = false; bool ret = false;
if (view3d) { if (view3d) {
if (shading_settings.use_scene_lights != V3D_USES_SCENE_LIGHTS(view3d)) if (shading_settings.use_scene_lights != V3D_USES_SCENE_LIGHTS(view3d)) {
{
shading_settings.use_scene_lights = V3D_USES_SCENE_LIGHTS(view3d); shading_settings.use_scene_lights = V3D_USES_SCENE_LIGHTS(view3d);
ret = true; ret = true;
} }
@ -688,14 +686,12 @@ bool BlenderSceneDelegate::set_world_shading_settings(View3D const *view3d)
if (shading_settings.shading_flag != view3d->shading.flag || if (shading_settings.shading_flag != view3d->shading.flag ||
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 13:01:08 +02:00
Outdated
Review
Copy Link

simplify by using add operator==() and copy constructor to ShadingSettings

ShadingSettings prev_settings(shading_settings);
shading_settings. ....
return shading_settings != prev_settings;
simplify by using add `operator==()` and copy constructor to ShadingSettings ``` ShadingSettings prev_settings(shading_settings); shading_settings. .... return shading_settings != prev_settings; ```
shading_settings.lookdev_light != view3d->shading.lookdev_light || shading_settings.lookdev_light != view3d->shading.lookdev_light ||
shading_settings.rotation != view3d->shading.studiolight_rot_z || shading_settings.rotation != view3d->shading.studiolight_rot_z ||
shading_settings.intensity != view3d->shading.studiolight_intensity shading_settings.intensity != view3d->shading.studiolight_intensity)
)
{ {
shading_settings.shading_flag = view3d->shading.flag; shading_settings.shading_flag = view3d->shading.flag;
shading_settings.lookdev_light = view3d->shading.lookdev_light; shading_settings.lookdev_light = view3d->shading.lookdev_light;
shading_settings.rotation = view3d->shading.studiolight_rot_z; shading_settings.rotation = view3d->shading.studiolight_rot_z;
shading_settings.intensity = view3d->shading.studiolight_intensity; shading_settings.intensity = view3d->shading.studiolight_intensity;
ret = true; ret = true;
} }
} }