sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T49010: Portals don't work in recent Blender versions

Browse Source
This commit is contained in:
Sergey Sharybin 2016-08-03 12:38:25 +02:00
parent 960db4c961
commit 285e082a77
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,14 +238,19 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
/* count */ /* count */
size_t num_lights = 0; size_t num_lights = 0;
size_t num_portals = 0;
size_t num_background_lights = 0; size_t num_background_lights = 0;
size_t num_triangles = 0; size_t num_triangles = 0;
bool background_mis = false; bool background_mis = false;
foreach(Light *light, scene->lights) { foreach(Light *light, scene->lights) {
if(light->is_enabled) if(light->is_enabled) {
num_lights++; num_lights++;
}
if(light->is_portal) {
num_portals++;
}
} }
foreach(Object *object, scene->objects) { foreach(Object *object, scene->objects) {
@ -435,9 +440,9 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
device->tex_alloc("__light_distribution", dscene->light_distribution); device->tex_alloc("__light_distribution", dscene->light_distribution);
/* Portals */ /* Portals */
if(num_background_lights > 0 && light_index != num_lights) { if(num_portals > 0) {
kintegrator->portal_offset = light_index; kintegrator->portal_offset = light_index;
kintegrator->num_portals = num_lights - light_index; kintegrator->num_portals = num_portals;
kintegrator->portal_pdf = background_mis? 0.5f: 1.0f; kintegrator->portal_pdf = background_mis? 0.5f: 1.0f;
} }
else { else {
@ -601,10 +606,10 @@ void LightManager::device_update_points(Device *device,
Scene *scene) Scene *scene)
{ {
int num_scene_lights = scene->lights.size(); int num_scene_lights = scene->lights.size();
int num_lights = 0;
int num_lights = 0;
foreach(Light *light, scene->lights) { foreach(Light *light, scene->lights) {
if(light->is_enabled) { if(light->is_enabled || light->is_portal) {
num_lights++; num_lights++;
} }
} }