diff --git a/doc/samples/btphystest.cpp b/doc/samples/btphystest.cpp
index d093de53..53bfb94c 100644
--- a/doc/samples/btphystest.cpp
+++ b/doc/samples/btphystest.cpp
@@ -414,7 +414,7 @@ void BtPhysTest::TickGame(float seconds)
         return;
     }
 
-    Debug::DrawSetupSegment(1.f);
+    auto context = Debug::DrawContext::New(Color::white, 1.f);
     Debug::DrawGrid(vec3::zero, vec3::axis_x, vec3::axis_y, vec3::axis_z, 10.f);
 
     if (m_controller->WasKeyReleasedThisFrame(BtPhysTestKeyInput::KEY_QUIT))
diff --git a/doc/samples/meshviewer/meshviewer.cpp b/doc/samples/meshviewer/meshviewer.cpp
index 6db6cfdb..30617968 100644
--- a/doc/samples/meshviewer/meshviewer.cpp
+++ b/doc/samples/meshviewer/meshviewer.cpp
@@ -384,8 +384,7 @@ void MeshViewer::TickDraw(float seconds, Scene &scene)
 
     //Draw gizmos & grid
     Debug::DrawGizmo(vec3::zero, vec3::axis_x, vec3::axis_y, vec3::axis_z, 10.f);
-    Debug::DrawSetupColor(Color::white);
-    Debug::DrawSetupSegment(1.f);
+    auto context = Debug::DrawContext::New(Color::white);
     Debug::DrawGrid(vec3::zero, vec3::axis_x, vec3::axis_y, vec3::axis_z, 10.f);
 
     /** OLD STUFF **/