ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/pmapcontrib.c
(Generate patch)

Comparing ray/src/rt/pmapcontrib.c (file contents):
Revision 2.7 by greg, Wed May 20 14:44:12 2015 UTC vs.
Revision 2.8 by greg, Thu May 21 13:54:59 2015 UTC

# Line 51 | Line 51 | static void checkPmapContribs (const PhotonMap *pmap,
51        if (primary -> srcIdx < 0 || primary -> srcIdx >= nsources)
52           error(INTERNAL, "invalid light source index in photon map");
53          
54 <      srcMod = objptr(source [primary -> srcIdx].so -> omod);
54 >      srcMod = findmaterial(source [primary -> srcIdx].so);
55        if ((MODCONT*)lu_find(srcContrib, srcMod -> oname) -> data)
56           ++found;
57     }
# Line 155 | Line 155 | void photonContrib (PhotonMap *pmap, RAY *ray, COLOR i
155           const PhotonPrimary *primary = pmap -> primary +
156                                          sq -> photon -> primary;
157           const SRCREC *sp = &source[primary -> srcIdx];
158 <         OBJREC *srcMod = objptr(sp -> so -> omod);
158 >         OBJREC *srcMod = findmaterial(sp -> so);
159           MODCONT *srcContrib = (MODCONT*)lu_find(pmap -> srcContrib,
160                                                   srcMod -> oname) -> data;
161           if (!srcContrib)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines