Skip to content

Commit d4b03be

Browse files
committed
fix(w3dview): move RefCountPtr::Clear() calls into proper scope
1 parent 8b8ee9b commit d4b03be

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Core/Tools/W3DView/W3DViewDoc.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ CW3DViewDoc::CleanupResources (void)
170170

171171
if (m_pCursor != NULL) {
172172
m_pCursor->Remove ();
173+
m_pCursor.Clear();
173174
}
174-
m_pCursor.Clear();
175175
m_pCursorScene.Clear();
176176

177177
if (m_pCScene)
@@ -601,16 +601,16 @@ CW3DViewDoc::Display_Emitter
601601
// Data OK?
602602
if (m_pCScene != NULL) {
603603

604-
// Lose the animation
605-
SAFE_DELETE (m_pCAnimCombo);
606-
m_pCAnimation.Clear();
604+
// Lose the animation
605+
SAFE_DELETE (m_pCAnimCombo);
606+
m_pCAnimation.Clear();
607607

608-
if (m_pCRenderObj != NULL) {
609-
// Remove this object from the scene
610-
Remove_Object_From_Scene (m_pCRenderObj.Peek());
611-
}
608+
if (m_pCRenderObj != NULL) {
609+
// Remove this object from the scene
610+
Remove_Object_From_Scene (m_pCRenderObj.Peek());
612611
m_pCRenderObj.Clear();
613-
m_pCScene->Clear_Lineup();
612+
}
613+
m_pCScene->Clear_Lineup();
614614

615615
// Do we have a new emitter to display?
616616
if (pemitter != NULL) {
@@ -666,8 +666,8 @@ CW3DViewDoc::DisplayObject
666666
if (m_pCRenderObj) {
667667
// Remove this object from the scene
668668
Remove_Object_From_Scene (m_pCRenderObj.Peek());
669+
m_pCRenderObj.Clear();
669670
}
670-
m_pCRenderObj.Clear();
671671
}
672672
m_pCScene->Clear_Lineup();
673673

0 commit comments

Comments
 (0)