Skip to content

Commit 30af492

Browse files
Merge pull request #157 from Devsh-Graphics-Programming/criss_master
interesting crashbug in release mode @AnastaZIuk investigate!
2 parents dfbe4f2 + 2e56537 commit 30af492

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

examples_tests/22.RaytracedAO/Renderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ Renderer::InitializationData Renderer::initSceneObjects(const SAssetBundle& mesh
446446
{
447447
if (mb==*meshBuffers.begin())
448448
m_sceneBound.addInternalBox(core::transformBoxEx(aabbMesh,newInstanceData->tform));
449-
auto emitter = auxIt->frontEmitter;
449+
const auto& emitter = auxIt->frontEmitter;
450450
if (emitter.type!=ext::MitsubaLoader::CElementEmitter::Type::INVALID)
451451
{
452452
assert(emitter.type==ext::MitsubaLoader::CElementEmitter::Type::AREA);

include/nbl/ext/MitsubaLoader/CMitsubaMetadata.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ class CMitsubaMetadata : public asset::IAssetMetadata
7676
CElementEmitter frontEmitter; // type is invalid if not used
7777
CElementEmitter backEmitter; // type is invalid if not used
7878
CMitsubaMaterialCompilerFrontend::front_and_back_t bsdf;
79-
#if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
80-
std::string bsdf_id;
81-
#endif
8279
};
8380

8481
core::SRange<const SInstanceAuxilaryData> m_instanceAuxData;
@@ -186,9 +183,6 @@ class CMitsubaMetadata : public asset::IAssetMetadata
186183
inst.emitter.front,
187184
inst.emitter.back,
188185
inst.bsdf
189-
#if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
190-
,inst.bsdf_id
191-
#endif
192186
};
193187
}
194188
meta->m_instances = { instanceStorageBegin,m_instanceStorageIt };

0 commit comments

Comments
 (0)