Fix to avoid incompatible behaviors when adding objects to a group

Author: D8H

Core/GDCore/IDE/ObjectRefactorer.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/ObjectGroup.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
+#include "GDCore/Project/ObjectTools.h"
 #include "GDCore/Project/Variable.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
@@ -161,6 +162,7 @@ void ObjectRefactorer::FillMissingGroupVariablesToObject(
 }
 
 void ObjectRefactorer::FillMissingGroupBehaviorToObject(
+    const gd::Platform& platform,
     gd::ObjectsContainer &globalObjectsContainer,
     gd::ObjectsContainer &objectsContainer, gd::Object &object,
     const gd::ObjectGroup &objectGroup, const gd::String &behaviorName) {
@@ -180,8 +182,12 @@ void ObjectRefactorer::FillMissingGroupBehaviorToObject(
   if (!firstObject.HasBehaviorNamed(behaviorName)) {
     return;
   }
-  object.GetBehaviors().AddBehavior(firstObject.GetBehavior(behaviorName),
-                                    behaviorName);
+  auto &behavior = firstObject.GetBehavior(behaviorName);
+  if (!gd::ObjectTools::IsBehaviorCompatibleWithObject(
+          platform, object.GetType(), behavior.GetTypeName())) {
+    return;
+  }
+  object.GetBehaviors().AddBehavior(behavior, behaviorName);
 }
 
 // TODO Handle position changes for group variables.

Core/GDCore/IDE/ObjectRefactorer.h

@@ -14,6 +14,7 @@ class Object;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
+class Platform;
 class VariablesContainer;
 struct VariablesChangeset;
 } // namespace gd
@@ -76,6 +77,7 @@ class GD_CORE_API ObjectRefactorer {
    * group.
    */
   static void FillMissingGroupBehaviorToObject(
+      const gd::Platform& platform,
       gd::ObjectsContainer &globalObjectsContainer,
       gd::ObjectsContainer &objectsContainer, gd::Object &object,
       const gd::ObjectGroup &objectGroup, const gd::String &behaviorName);

GDevelop.js/Bindings/Bindings.idl

@@ -382,6 +382,7 @@ interface ObjectRefactorer {
         [Ref] gdObject obj,
         [ Const, Ref ] VariablesContainer groupVariablesContainer);
     void STATIC_FillMissingGroupBehaviorToObject(
+        [Const, Ref] Platform platform,
         [Ref] ObjectsContainer globalObjectsContainer,
         [Ref] ObjectsContainer objectsContainer,
         [Ref] gdObject obj,

GDevelop.js/types.d.ts

@@ -423,7 +423,7 @@ export class ObjectRefactorer extends EmscriptenObject {
   static fillAnyVariableBetweenObjects(globalObjectsContainer: ObjectsContainer, objectsContainer: ObjectsContainer, objectGroup: ObjectGroup): void;
   static applyChangesToVariants(eventsBasedObject: EventsBasedObject, objectName: string, changeset: VariablesChangeset): void;
   static fillMissingGroupVariablesToObject(obj: gdObject, groupVariablesContainer: VariablesContainer): void;
-  static fillMissingGroupBehaviorToObject(globalObjectsContainer: ObjectsContainer, objectsContainer: ObjectsContainer, obj: gdObject, objectGroup: ObjectGroup, behaviorName: string): void;
+  static fillMissingGroupBehaviorToObject(platform: Platform, globalObjectsContainer: ObjectsContainer, objectsContainer: ObjectsContainer, obj: gdObject, objectGroup: ObjectGroup, behaviorName: string): void;
 }
 
 export class EventsBasedObjectVariantHelper extends EmscriptenObject {

GDevelop.js/types/gdobjectrefactorer.js

@@ -4,7 +4,7 @@ declare class gdObjectRefactorer {
   static fillAnyVariableBetweenObjects(globalObjectsContainer: gdObjectsContainer, objectsContainer: gdObjectsContainer, objectGroup: gdObjectGroup): void;
   static applyChangesToVariants(eventsBasedObject: gdEventsBasedObject, objectName: string, changeset: gdVariablesChangeset): void;
   static fillMissingGroupVariablesToObject(obj: gdObject, groupVariablesContainer: gdVariablesContainer): void;
-  static fillMissingGroupBehaviorToObject(globalObjectsContainer: gdObjectsContainer, objectsContainer: gdObjectsContainer, obj: gdObject, objectGroup: gdObjectGroup, behaviorName: string): void;
+  static fillMissingGroupBehaviorToObject(platform: gdPlatform, globalObjectsContainer: gdObjectsContainer, objectsContainer: gdObjectsContainer, obj: gdObject, objectGroup: gdObjectGroup, behaviorName: string): void;
   delete(): void;
   ptr: number;
 };

newIDE/app/src/EditorFunctions/index.js

@@ -6219,6 +6219,7 @@ const changeScenePropertiesLayersEffectsGroups: EditorFunction = {
                 );
                 for (const behaviorName of groupVisibleBehaviorNames) {
                   gd.ObjectRefactorer.fillMissingGroupBehaviorToObject(
+                    project.getCurrentPlatform(),
                     globalObjects,
                     sceneObjects,
                     object,

newIDE/app/src/ObjectGroupEditor/CompactObjectGroupPropertiesEditor.js

@@ -221,6 +221,7 @@ export const CompactObjectGroupPropertiesEditor = ({
       );
       for (const behaviorName of allVisibleBehaviorNames) {
         gd.ObjectRefactorer.fillMissingGroupBehaviorToObject(
+          project.getCurrentPlatform(),
           globalObjectsContainer || objectsContainer,
           objectsContainer,
           object,
@@ -237,6 +238,7 @@ export const CompactObjectGroupPropertiesEditor = ({
       groupVariablesContainer,
       objectGroup,
       objectsContainer,
+      project,
     ]
   );