Skip to content

Commit

Permalink
Merge branch 'master' of github.com:appleseedhq/appleseed
Browse files Browse the repository at this point in the history
  • Loading branch information
dictoon committed Aug 5, 2014
2 parents aab3664 + 990be9f commit 23349fa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/appleseed/renderer/meta/tests/test_bsdfmix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
using namespace foundation;
using namespace renderer;

#if !defined WITH_OSL && !defined WITH_OIIO
#ifndef WITH_OIIO

TEST_SUITE(Renderer_Modeling_BSDF_BSDFMix)
{
Expand Down

0 comments on commit 23349fa

Please sign in to comment.