Skip to content

Commit b75dbc2

Browse files
yozhijkyozhijk
committed
Merge branch 'mis-fix' into analytic-lights
# Conflicts: # App/CL/integrator_pt.cl # App/CL/payload.cl # App/CL/scene.cl
2 parents 7919360 + c01ed85 commit b75dbc2

File tree

20 files changed

+426
-185
lines changed

20 files changed

+426
-185
lines changed

‎3rdparty/embree/bin/win32/embree.dll renamed to ‎3rdparty/embree/bin/x32/embree.dll

File renamed without changes.

‎3rdparty/embree/lib/win32/embree.lib renamed to ‎3rdparty/embree/lib/x32/embree.lib

File renamed without changes.

‎3rdparty/freeglut/bin/x86/freeglut.dll renamed to ‎3rdparty/freeglut/bin/x32/freeglut.dll

File renamed without changes.

‎3rdparty/freeglut/lib/x86/freeglut.lib renamed to ‎3rdparty/freeglut/lib/x32/freeglut.lib

File renamed without changes.

‎3rdparty/glew/bin/x86/glew32.dll renamed to ‎3rdparty/glew/bin/x32/glew32.dll

File renamed without changes.

‎3rdparty/glew/lib/x86/glew.lib renamed to ‎3rdparty/glew/lib/x32/glew.lib

File renamed without changes.

‎3rdparty/oiio/bin/x86/OpenImageIO.dll renamed to ‎3rdparty/oiio/bin/x32/OpenImageIO.dll

File renamed without changes.

‎3rdparty/oiio/bin/x86/OpenImageIOD.dll renamed to ‎3rdparty/oiio/bin/x32/OpenImageIOD.dll

File renamed without changes.

‎3rdparty/oiio/lib/x86/OpenImageIO.lib renamed to ‎3rdparty/oiio/lib/x32/OpenImageIO.lib

File renamed without changes.

‎3rdparty/oiio/lib/x86/OpenImageIOD.lib renamed to ‎3rdparty/oiio/lib/x32/OpenImageIOD.lib

File renamed without changes.

0 commit comments

Comments
 (0)