diff options
| author | Marijn Tamis <[email protected]> | 2019-04-01 14:21:09 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2019-04-01 14:21:09 +0200 |
| commit | d243404d4ba88bcf53f7310cc8980b4efe38c19f (patch) | |
| tree | dcc8ce2904e9f813e03f71f825c4d3c9ec565d91 /NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp | |
| parent | Add new SetSpheres and SetPlanes api's to bring them in line with setTriangles. (diff) | |
| download | nvcloth-d243404d4ba88bcf53f7310cc8980b4efe38c19f.tar.xz nvcloth-d243404d4ba88bcf53f7310cc8980b4efe38c19f.zip | |
1.1.6 Release.1.1.6
Diffstat (limited to 'NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp')
| -rw-r--r-- | NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp b/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp index eb07c84..46d29dd 100644 --- a/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp +++ b/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp @@ -12,6 +12,7 @@ #include <DirectXMath.h> #include "ShaderUtils.h" #include "Renderer.h" +#include <NvCloth/Callbacks.h> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -116,7 +117,7 @@ void RenderMaterial::setBlending(BlendMode blendMode) desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; break; default: - PX_ALWAYS_ASSERT_MESSAGE("Unknown blend mode"); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,"Unknown blend mode"); } ID3D11Device* device = GetDeviceManager()->GetDevice(); @@ -187,7 +188,7 @@ RenderMaterial::InstancePtr RenderMaterial::getMaterialInstance(const D3D11_INPU return materialInstance; } } - PX_ALWAYS_ASSERT(); + NV_CLOTH_ASSERT(false); return NULL; } |