further photon mapper fixes

metadata
Wenzel Jakob 2011-03-14 19:12:14 +01:00
parent bbde81ab99
commit ece6baf6ce
2 changed files with 4 additions and 3 deletions

View File

@ -202,7 +202,7 @@ public:
/// Initialize the query record for a recursive query
inline void recursiveQuery(const RadianceQueryRecord &parent) {
type = parent.type;
type = parent.type | EIntersection;
scene = parent.scene;
sampler = parent.sampler;
depth = parent.depth+1;

View File

@ -305,8 +305,9 @@ public:
if (bsdf == NULL) {
RadianceQueryRecord rRec2;
rRec2.recursiveQuery(rRec, rRec.type);
return m_parentIntegrator->Li(RayDifferential(its.p, ray.d, ray.time), rRec2);
rRec2.recursiveQuery(rRec);
Li += m_parentIntegrator->Li(RayDifferential(its.p, ray.d, ray.time), rRec2);
return Li;
}
int bsdfType = bsdf->getType();