diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 724362d36..9d44a35e8 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -42,10 +42,10 @@ globalvar HOTKEYS, HOTKEY_CONTEXT; LATEST_VERSION = 1_18_00_0; - VERSION = 1_18_05_1; + VERSION = 1_18_06_0; SAVE_VERSION = 1_18_05_0; - VERSION_STRING = MAC? "1.18.003m" : "1.18.6.011"; - BUILD_NUMBER = 1_18_05_6; + VERSION_STRING = MAC? "1.18.003m" : "1.18.6"; + BUILD_NUMBER = 1_18_06_0; PREF_VERSION = 1_17_1; var _vsp = string_split(VERSION_STRING, "."); diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index e213ce4fa..59033c81c 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -988,7 +988,6 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { } static getInputDataFull = function(index, def = 0) { return array_safe_get_fast(inputs_data, index, def); } - static getInputDataLite = function(index, def = 0) { return inputs[index].getValue(); } static getInputDataForce = function(index, def = 0) { return inputs[index].getValue(); } // static setInputData = function(index, value) { diff --git a/scripts/node_group_input/node_group_input.gml b/scripts/node_group_input/node_group_input.gml index 8e0940c76..362886a40 100644 --- a/scripts/node_group_input/node_group_input.gml +++ b/scripts/node_group_input/node_group_input.gml @@ -465,6 +465,7 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru __data = noone; static update = function(frame = CURRENT_FRAME) { + if(!is(inParent, NodeValue)) return; outputs[0].setValue(inParent.getValue()); var _dstype = inputs[0].getValue(); diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index b0a2ee036..76672af25 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -413,7 +413,7 @@ function __initNodes() { ds_list_add(vfx, "Generates"); addNodeObject(vfx, "VFX Trail", s_node_vfx_trail, "Node_VFX_Trail", [1, Node_VFX_Trail],, "Generate path from particle movement.").hideRecent().setVersion(11560); addNodeObject(vfx, "VFX Triangulate", s_node_vfx_triangulate, "Node_VFX_Triangulate", [1, Node_VFX_Triangulate],, "Render line between particles.").hideRecent().setVersion(11670); - + ds_list_add(vfx, "Variables"); addNodeObject(vfx, "VFX Variable", s_node_vfx_variable, "Node_VFX_Variable", [1, Node_VFX_Variable],, "Extract variable from particle objects.").hideRecent().setVersion(1120); addNodeObject(vfx, "VFX Override", s_node_vfx_override, "Node_VFX_Override", [1, Node_VFX_Override],, "Replace particle variable with a new one.").hideRecent().setVersion(1120); diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index cd384b241..0c196cd41 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -653,7 +653,7 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con static postDeserialize = function() { if(CLONING) return; - if(LOADING_VERSION < 1_18_01_0) { + if(LOADING_VERSION < 1_18_01_0 && array_length(load_map.inputs) >= 23) { var _dat = load_map.inputs[23].raw_value; for( var i = 0, n = array_length(_dat); i < n; i++ ) _dat[i][1] = is_array(_dat[i][1])? array_safe_get(_dat[i][1], 1) : _dat[i][1];