archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T71123: OptiX error in Cycles viewport when adding HDRI

Browse Source 
Cycles did not update the "is_enabled" flag on lights when they were synchronized again, which caused all lights disabled by "LightManager::disable_ineffective_light" to be disabled indefinitely. As a result the OptiX kernels were not reloaded with correct features when a change to a light was made. This fixes that by updating the "is_enabled" flag during synchronization.

Differential Revision: https://developer.blender.org/D6141
This commit is contained in:
Patrick Mours
2019-10-29 16:32:53 +01:00
parent 8ab6ef30ab
commit b45828ebe9
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/blender_object.cpp
View File

@@ -269,6 +269,9 @@ void BlenderSync::sync_background_light(BL::SpaceView3D &b_v3d, bool use_portal)
light->use_mis = sample_as_light; light->use_mis = sample_as_light;
light->max_bounces = get_int(cworld, "max_bounces"); light->max_bounces = get_int(cworld, "max_bounces");
/* force enable light again when world is resynced */
light->is_enabled = true;
int samples = get_int(cworld, "samples"); int samples = get_int(cworld, "samples");
if (get_boolean(cscene, "use_square_samples")) if (get_boolean(cscene, "use_square_samples"))
light->samples = samples * samples; light->samples = samples * samples;

12
intern/cycles/render/light.cpp
View File

@@ -221,13 +221,11 @@ void LightManager::disable_ineffective_light(Scene *scene)
*/ */
Shader *shader = (scene->background->shader) ? scene->background->shader : Shader *shader = (scene->background->shader) ? scene->background->shader :
scene->default_background; scene->default_background;
bool disable_mis = !(has_portal || shader->has_surface_spatial_varying); const bool disable_mis = !(has_portal || shader->has_surface_spatial_varying);
if (disable_mis) { VLOG_IF(1, disable_mis) << "Background MIS has been disabled.\n";
VLOG(1) << "Background MIS has been disabled.\n"; foreach (Light *light, scene->lights) {
foreach (Light *light, scene->lights) { if (light->type == LIGHT_BACKGROUND) {
if (light->type == LIGHT_BACKGROUND) { light->is_enabled = !disable_mis;
light->is_enabled = false;
}
} }
} }
} }