diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 25df7de55..d1ae9111d 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -605,7 +605,6 @@ {"$GMIncludedFile":"","%Name":"tooltip_spr.png","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Compose/Node_Render_Sprite_Sheet","name":"tooltip_spr.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Compose/Node_Stack","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"tooltip_spr.png","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Compose/Node_Stack","name":"tooltip_spr.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Custom/Node_Custom","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Feedback/Node_Feedback_Input","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Feedback/Node_Feedback_Output","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"info.json","CopyToMask":-1,"filePath":"datafiles/data/Nodes/Internal/Filter/Node_2D_light","name":"info.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, diff --git a/datafiles/data/Collections.zip b/datafiles/data/Collections.zip index 7c2580f2d..b91afbcea 100644 Binary files a/datafiles/data/Collections.zip and b/datafiles/data/Collections.zip differ diff --git a/datafiles/data/Nodes/Internal.zip b/datafiles/data/Nodes/Internal.zip index 8ca3c64f3..841418dab 100644 Binary files a/datafiles/data/Nodes/Internal.zip and b/datafiles/data/Nodes/Internal.zip differ diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 439050284..463b0400e 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -43,7 +43,7 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_06_2; SAVE_VERSION = 1_18_05_0; - VERSION_STRING = MAC? "1.18.003m" : "1.18.7"; + VERSION_STRING = MAC? "1.18.003m" : "1.18.7.1"; BUILD_NUMBER = 118070; PREF_VERSION = 1_17_1; diff --git a/scripts/save_function/save_function.gml b/scripts/save_function/save_function.gml index 036785d9f..3f68d6963 100644 --- a/scripts/save_function/save_function.gml +++ b/scripts/save_function/save_function.gml @@ -159,6 +159,8 @@ function SAVE_NODE(_arr, _node, dx = 0, dy = 0, scale = false, context = PANEL_G } var m = _node.serialize(scale); + if(!is_struct(m)) return; + m.x -= dx; m.y -= dy;