From bb0878417ea7a4d93cf46e3cf721b9f3cb29f993 Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Tue, 23 Sep 2025 08:04:39 -0700 Subject: [PATCH] Automated g4 rollback of changelist 810355812. *** Reason for rollback *** mjv_makeScene does not call mjv_defaultScene directly. Instead, it calls mjv_freeScene which calls mjv_defaultScene. However, mjv_freeScene attempts to free pointers if they are not NULL and if you don't call mjv_defaultScene then you'll have garbage data in those pointers. *** Original change description *** Remove redundant mjv_defaultScene call since its called by mjv_makeScene *** PiperOrigin-RevId: 810442645 Change-Id: Ica50493d6769a0afb086f9ead99d731cdf0d75d9 --- src/experimental/toolbox/renderer.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/experimental/toolbox/renderer.cc b/src/experimental/toolbox/renderer.cc index aa51e8b6..e4164ef8 100644 --- a/src/experimental/toolbox/renderer.cc +++ b/src/experimental/toolbox/renderer.cc @@ -22,8 +22,6 @@ namespace mujoco::toolbox { -static constexpr int kMaxGeom = 2000; - Renderer::Renderer(MakeContextFn make_context_fn) : make_context_fn_(make_context_fn) { } @@ -40,7 +38,8 @@ void Renderer::Init(const mjModel* model) { } make_context_fn_(model, &render_context_); - mjv_makeScene(model, &scene_, kMaxGeom); + mjv_defaultScene(&scene_); + mjv_makeScene(model, &scene_, 2000); initialized_ = true; }