search

cmu-ci-lab / MitsubaToFRenderer

Mitsuba time-of-flight renderer.
54 stars 22 forks source link

possible bad merge of bdpt.h and bdpt.cpp #1

Closed felipegb94 closed 5 years ago

felipegb94 commented 5 years ago

Hi,

I recently pulled the latest changes into my fork of MitsubaToFRenderer and when I tried to compile the code I ran into the following error:

include/../src/integrators/bdpt/bdpt.h:76:15: error: redeclaration of ‘unsigned int mitsuba::BDPTConfiguration::m_tBounces’
  unsigned int m_tBounces;

I looked at the bdpt.h file and it looks like from lines 66 through 77 you have some duplicate code. I also noticed this in bdpt.cpp in lines 225 to 238.

Deleting the duplicate code fixed the issue for me.

Thanks! Felipe

AdithyaPediredla commented 5 years ago

Thank you, Felipe. A previous merge created duplicate code that I haven't noticed. Fixed it now.