More codegen edge case handling and support for older projects.

vchelaru · Feb 22, 2024 · f711b5c · f711b5c
1 parent 5a94d4e
commit f711b5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/FRBDK/Glue/Glue/CodeGeneration/CustomVariableCodeGenerator.cs b/FRBDK/Glue/Glue/CodeGeneration/CustomVariableCodeGenerator.cs
@@ -1418,12 +1418,14 @@ public static ICodeBlock AppendAssignmentForCustomVariableInInstance(NamedObject
                         rootElementForVariable = ObjectFinder.Self.GetElement(referencedNamedObject.SourceClassType);
                         rootVariable = customVariable.SourceObjectProperty;
 
-                        customVariable = rootElementForVariable.GetCustomVariable(customVariable.SourceObjectProperty);
+                        customVariable = rootElementForVariable.GetCustomVariable(customVariable.SourceObjectProperty) 
+                            // If one wasn't found, stick with this one:
+                            ?? customVariable;
                     }
                     else
                     {
                         var nosAti = referencedNamedObject?.GetAssetTypeInfo();
-                        var nosAtiVariableDefinition = nosAti.VariableDefinitions?.FirstOrDefault(item => item.Name == customVariable.SourceObjectProperty);
+                        var nosAtiVariableDefinition = nosAti?.VariableDefinitions?.FirstOrDefault(item => item.Name == customVariable.SourceObjectProperty);
 
                         if (nosAtiVariableDefinition?.CustomGenerationFunc != null)
                         {

diff --git a/FRBDK/Glue/GumPlugin/GumPlugin/CodeGeneration/FormsObjectCodeGenerator.cs b/FRBDK/Glue/GumPlugin/GumPlugin/CodeGeneration/FormsObjectCodeGenerator.cs
@@ -57,7 +57,7 @@ public override ICodeBlock GenerateInitialize(ICodeBlock codeBlock, IElement ele
 
                 var rfs = GumPluginCodeGenerator.GetGumScreenRfs(element);
 
-                if (hasForms && rfs?.RuntimeType != "FlatRedBall.Gum.GumIdb")
+                if (hasForms && rfs?.RuntimeType != "FlatRedBall.Gum.GumIdb" && rfs?.RuntimeType != "Gum.Wireframe.GraphicalUiElement")
                 {
                     var rfsName = rfs.GetInstanceName();
                     var formsObjectType = FormsClassCodeGenerator.Self.GetFullRuntimeNamespaceFor(elementName, "Screens") +