[Bf-blender-cvs] [136991be1a8] gsoc-2018-many-light-sampling: Merge branch 'master' into gsoc-2018-many-light-sampling
Erik Englesson
noreply at git.blender.org
Fri Jun 29 16:27:16 CEST 2018
Commit: 136991be1a8afc6938c587558a0a75f096888d5a
Author: Erik Englesson
Date: Fri Jun 29 11:02:18 2018 +0200
Branches: gsoc-2018-many-light-sampling
https://developer.blender.org/rB136991be1a8afc6938c587558a0a75f096888d5a
Merge branch 'master' into gsoc-2018-many-light-sampling
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel_types.h
index d822dfad0f9,c2a65dc9999..50d5f41f48c
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@@ -1315,17 -1308,11 +1319,18 @@@ typedef struct KernelIntegrator
int use_ambient_occlusion;
int num_distribution;
int num_all_lights;
+ int num_light_nodes;
+ int num_triangle_lights;
+ int num_distant_lights;
+ float inv_num_distant_lights;
float pdf_triangles;
float pdf_lights;
+ float pdf_inv_totarea;
- int pdf_background_res;
+ int pdf_background_res_x;
+ int pdf_background_res_y;
float light_inv_rr_threshold;
+ int distant_lights_offset;
+ int background_light_index;
/* light portals */
float portal_pdf;
diff --cc intern/cycles/render/light.cpp
index a0af7e1213a,122c5dfb07a..b5205a2f2fa
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@@ -18,9 -18,10 +18,11 @@@
#include "device/device.h"
#include "render/integrator.h"
#include "render/film.h"
+ #include "render/graph.h"
#include "render/light.h"
+#include "render/light_tree.h"
#include "render/mesh.h"
+ #include "render/nodes.h"
#include "render/object.h"
#include "render/scene.h"
#include "render/shader.h"
More information about the Bf-blender-cvs
mailing list