Skip to content

Commit ac880ea

Browse files
committed
Added catch of nullptr viewMatrix
1 parent 960e38d commit ac880ea

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

cmake/cppcheck-suppression-list.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ shadowFunction:*/src/vsg/state/DescriptorImage.cpp
208208
shadowFunction:*/src/vsg/utils/FindDynamicObjects.cpp
209209
shadowFunction:*/src/vsg/utils/LoadPagedLOD.cpp
210210
shadowFunction:*/src/vsg/utils/PropagateDynamicObjects.cpp
211+
shadowFunction:*/src/vsg/app/ViewMatrix.cpp
211212

212213
// suppress unhelpful warning of c casts
213214
cstyleCast:*/include/vsg/io/mem_stream.h

src/vsg/app/RecordTraversal.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,15 @@ void RecordTraversal::apply(const CoordinateFrame& cf)
444444
Camera* camera = parentView ? parentView->camera : nullptr;
445445
ViewMatrix* viewMatrix = camera ? camera->viewMatrix : nullptr;
446446

447-
_state->modelviewMatrixStack.push(viewMatrix->transform(cf.origin));
447+
if (viewMatrix)
448+
{
449+
_state->modelviewMatrixStack.push(viewMatrix->transform(cf.origin));
450+
}
451+
else
452+
{
453+
_state->modelviewMatrixStack.push(cf);
454+
}
455+
448456
_state->dirty = true;
449457

450458
if (cf.subgraphRequiresLocalFrustum)

0 commit comments

Comments
 (0)