mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-24 22:16:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

- [Group] Fix error when connecting to dummy input.

Browse source
This commit is contained in:
Tanasart 2024-07-17 09:41:17 +07:00
parent 591a3a0a6c
commit 225cffb0f6
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/node_collection/node_collection.gml
View file

@ -196,20 +196,19 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc
managedRenderOrder = false;
input_dummy = nodeValue("Add to group", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0);
draw_dummy = false;
input_dummy = nodeValue("Add to group", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0);
input_dummy.is_dummy = true;
input_dummy.onSetFrom = function(juncFrom) {
array_remove(juncFrom.value_to, input_dummy);
input_dummy.value_from = noone;
var input = nodeBuild("Node_Group_Input", 0, 0, self);
var _type = juncFrom.type;
var _tind = array_find(input.data_type_map, juncFrom.type);
var _tind = array_find(GROUP_IO_TYPE_MAP, _type);
input.attributes.inherit_type = false;
if(_tind != -1)
input.inputs[| 2].setValue(_tind);
if(_tind != -1) input.inputs[| 2].setValue(_tind);
input.inParent.setFrom(juncFrom);
@ -586,19 +585,12 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc
/////============= CACHE =============
static clearCache = function() {
array_foreach(getNodeList(), function(node) { node.clearCache(); });
}
static clearCache = function() { array_foreach(getNodeList(), function(node) /*=>*/ { node.clearCache(); }); }
/////========== INSTANCING ===========
static setInstance = function(node) {
instanceBase = node;
}
static resetInstance = function() {
instanceBase = noone;
}
static setInstance = function(node) { instanceBase = node; }
static resetInstance = function() { instanceBase = noone; }
/////========= SERIALIZATION =========

2
scripts/node_value/node_value.gml
View file

@ -1612,7 +1612,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
static setFrom = function(_valueFrom, _update = true, checkRecur = true, log = false) { #region ////Set from
if(is_dummy) {
if(is_dummy && dummy_get != noone) {
var _targ = dummy_get();
dummy_target = _targ;
UNDO_HOLDING = true;