diff --git a/datafiles/data/Nodes/Internal.zip b/datafiles/data/Nodes/Internal.zip index 59ef3feb9..815b7b1f8 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 520460d50..f4a717db2 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.1"; + VERSION_STRING = MAC? "1.18.003m" : "1.18.7.1.001"; BUILD_NUMBER = 118070; PREF_VERSION = 1_17_1; diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 4b2a4d001..4ceb70129 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -1306,7 +1306,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { for( var j = 0, m = array_length(_ot.value_to); j < m; j++ ) { var _jto = _ot.value_to[j]; - if(_jto.value_from != _jto || !_jto.node.active) continue; + if(_jto.value_from != _ot || !_jto.node.active) continue; array_push(nodes, _jto.node); } } @@ -1316,18 +1316,18 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { for( var j = 0, m = array_length(_ot.value_to); j < m; j++ ) { var _jto = _ot.value_to[j]; - if(_jto.value_from != _jto || !_jto.node.active) continue; + if(_jto.value_from != _ot || !_jto.node.active) continue; array_push(nodes, _jto.node); } } for( var i = 0, n = array_length(inputs); i < n; i++ ) { var _in = inputs[i]; - if(_in.bypass_junc == noone) continue; + if(_in.bypass_junc == noone || !_in.bypass_junc.visible) continue; for( var j = 0, m = array_length(_in.value_to); j < m; j++ ) { var _jto = _in.value_to[j]; - if(_jto.value_from != _jto || !_jto.node.active) continue; + if(_jto.value_from != _ot || !_jto.node.active) continue; array_push(nodes, _jto.node); } } diff --git a/scripts/node_line/node_line.gml b/scripts/node_line/node_line.gml index cb0ff51d0..8fe71c9d6 100644 --- a/scripts/node_line/node_line.gml +++ b/scripts/node_line/node_line.gml @@ -589,16 +589,16 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons if(array_length(points) < 2) continue; random_set_seed(_sed + i); - if(_useTex && _scaleTex) shader_set_2("scale", [ _texSca[0] * _len, _texSca[1] ]); - if(_useTex) draw_primitive_begin_texture(pr_trianglestrip, tex); - else draw_primitive_begin(pr_trianglestrip); - var _ldata = line_data[i]; var _len = _ldata.length; var _caps = []; var pxs = []; var dat = array_safe_get_fast(_pathData, i, noone); + if(_useTex && _scaleTex) shader_set_2("scale", [ _texSca[0] * _len, _texSca[1] ]); + if(_useTex) draw_primitive_begin_texture(pr_trianglestrip, tex); + else draw_primitive_begin(pr_trianglestrip); + var _col_base = dat == noone? _colb.eval(random(1)) : dat.color; _ow = 1; diff --git a/scripts/render_data/render_data.gml b/scripts/render_data/render_data.gml index 9554907f9..0671d2494 100644 --- a/scripts/render_data/render_data.gml +++ b/scripts/render_data/render_data.gml @@ -77,7 +77,8 @@ function __sortNode(_arr, _node, _sorted) { if(struct_has(_sorted, _node.node_id)) return; array_push(_arr, _node); _sorted[$ _node.node_id] = 1; - _node.__nextNodes = noone; + _node.__nextNodes = noone; + _node.__nextNodesToLoop = noone; // print($" > Adding > {_node.name} | {_arr}"); } @@ -194,8 +195,8 @@ function Render(partial = false, runAction = false) { LOG_IF(global.FLAG.render == 1, $"----- Finding leaf from {array_length(PROJECT.nodeTopo)} nodes -----"); RENDER_QUEUE.clear(); array_foreach(PROJECT.nodeTopo, function(n) /*=>*/ { - n.passiveDynamic = false; - n.__nextNodes = noone; + n.passiveDynamic = false; + // n.__nextNodes = noone; n.render_time = 0; });