Fix T71123: OptiX error in Cycles viewport when adding HDRI
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:
parent
8ab6ef30ab
commit
b45828ebe9
Notes:
blender-bot
2023-06-12 00:52:52 +02:00
Referenced by issue #71123, 2.81 cycles viewport crash when adding hdri (optix)
|
@ -269,6 +269,9 @@ void BlenderSync::sync_background_light(BL::SpaceView3D &b_v3d, bool use_portal)
|
|||
light->use_mis = sample_as_light;
|
||||
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");
|
||||
if (get_boolean(cscene, "use_square_samples"))
|
||||
light->samples = samples * samples;
|
||||
|
|
|
@ -221,13 +221,11 @@ void LightManager::disable_ineffective_light(Scene *scene)
|
|||
*/
|
||||
Shader *shader = (scene->background->shader) ? scene->background->shader :
|
||||
scene->default_background;
|
||||
bool disable_mis = !(has_portal || shader->has_surface_spatial_varying);
|
||||
if (disable_mis) {
|
||||
VLOG(1) << "Background MIS has been disabled.\n";
|
||||
foreach (Light *light, scene->lights) {
|
||||
if (light->type == LIGHT_BACKGROUND) {
|
||||
light->is_enabled = false;
|
||||
}
|
||||
const bool disable_mis = !(has_portal || shader->has_surface_spatial_varying);
|
||||
VLOG_IF(1, disable_mis) << "Background MIS has been disabled.\n";
|
||||
foreach (Light *light, scene->lights) {
|
||||
if (light->type == LIGHT_BACKGROUND) {
|
||||
light->is_enabled = !disable_mis;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue