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

Comparing ray/src/rt/pmapooc.c (file contents):
Revision 1.3 by rschregle, Wed Jan 24 19:39:05 2018 UTC vs.
Revision 1.5 by greg, Thu Nov 8 00:54:07 2018 UTC

# Line 14 | Line 14
14  
15   #include "pmapdata.h"   /* Includes pmapooc.h */
16   #include "source.h"
17 + #include "otspecial.h"
18   #include "oocsort.h"
19   #include "oocbuild.h"
20  
# Line 256 | Line 257 | void OOC_FindPhotons (struct PhotonMap *pmap, const FV
257          
258     /* Set up filter callback */
259     filtData.pmap = pmap;
260 <   VCOPY(n, norm);
261 <   filtData.norm = n;
260 >   if (norm)
261 >      VCOPY(n, norm);
262 >   filtData.norm = norm ? n : NULL;
263     filt.data = &filtData;
264     filt.func = OOC_FilterPhoton;
265  
# Line 286 | Line 288 | void OOC_Find1Photon (struct PhotonMap* pmap, const FV
288    
289     /* Set up filter callback */
290     filtData.pmap = pmap;
291 <   VCOPY(n, norm);
292 <   filtData.norm = n;
291 >   if (norm)
292 >      VCOPY(n, norm);
293 >   filtData.norm = norm ? n : NULL;  
294     filt.data = &filtData;
295     filt.func = OOC_FilterPhoton;
296    

Diff Legend

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