Fix global objects not being rendered on the scene editor (#6822)

4ian · Jul 30, 2024 · 875237c · 875237c
1 parent 7aeb44d
commit 875237c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/newIDE/app/src/InstancesEditor/InstancesRenderer/LayerRenderer.js b/newIDE/app/src/InstancesEditor/InstancesRenderer/LayerRenderer.js
@@ -17,7 +17,7 @@ const gd: libGDevelop = global.gd;
 export default class LayerRenderer {
   project: gdProject;
   instances: gdInitialInstancesContainer;
-  globalObjectsContainer: gdObjectsContainer;
+  globalObjectsContainer: gdObjectsContainer | null;
   objectsContainer: gdObjectsContainer | null;
   /** `layer` can be changed at any moment (see InstancesRenderer).
    * /!\ Don't store any other reference.
@@ -100,7 +100,7 @@ export default class LayerRenderer {
   }: {
     project: gdProject,
     instances: gdInitialInstancesContainer,
-    globalObjectsContainer: gdObjectsContainer,
+    globalObjectsContainer: gdObjectsContainer | null,
     objectsContainer: gdObjectsContainer | null,
     layer: gdLayer,
     viewPosition: ViewPosition,

diff --git a/newIDE/app/src/InstancesEditor/InstancesRenderer/index.js b/newIDE/app/src/InstancesEditor/InstancesRenderer/index.js
@@ -17,7 +17,7 @@ export default class InstancesRenderer {
   instances: gdInitialInstancesContainer;
   layout: gdLayout | null;
   layersContainer: gdLayersContainer;
-  globalObjectsContainer: gdObjectsContainer;
+  globalObjectsContainer: gdObjectsContainer | null;
   objectsContainer: gdObjectsContainer | null;
   viewPosition: ViewPosition;
   onInstanceClicked: gdInitialInstance => void;
@@ -52,6 +52,7 @@ export default class InstancesRenderer {
   constructor({
     project,
     layersContainer,
+    globalObjectsContainer,
     objectsContainer,
     layout,
     instances,
@@ -66,10 +67,11 @@ export default class InstancesRenderer {
     onDownInstance,
     onUpInstance,
     showObjectInstancesIn3D,
-  }: {
+  }: {|
     project: gdProject,
     instances: gdInitialInstancesContainer,
     layersContainer: gdLayersContainer,
+    globalObjectsContainer: gdObjectsContainer | null,
     objectsContainer: gdObjectsContainer,
     layout: gdLayout | null,
     viewPosition: ViewPosition,
@@ -88,8 +90,9 @@ export default class InstancesRenderer {
     onDownInstance: (gdInitialInstance, number, number) => void,
     onUpInstance: (gdInitialInstance, number, number) => void,
     showObjectInstancesIn3D: boolean,
-  }) {
+  |}) {
     this.project = project;
+    this.globalObjectsContainer = globalObjectsContainer;
     this.instances = instances;
     this.layout = layout;
     this.layersContainer = layersContainer;