From 72c1b8ec7a6290ca1161ef5c272e28ae6b90dc39 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Thu, 14 Nov 2024 15:19:03 +0700 Subject: [PATCH] [Canvas group] Fix error on creation. --- objects/o_dialog_patreon/Create_0.gml | 14 ++++++++------ scripts/node_canvas_group/node_canvas_group.gml | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/objects/o_dialog_patreon/Create_0.gml b/objects/o_dialog_patreon/Create_0.gml index b7a8b7a26..a72298733 100644 --- a/objects/o_dialog_patreon/Create_0.gml +++ b/objects/o_dialog_patreon/Create_0.gml @@ -16,10 +16,12 @@ event_inherited(); server = network_create_server_raw(network_socket_ws, port, 32); } until(server >= 0 || attmp++ >= 100); - var _url = @"www.patreon.com/oauth2/authorize?response_type=code -&client_id=oZ1PNvUY61uH0FiA7ZPMBy77Xau3Ok9tfvsT_Y8DQwyKeMNjaVC35r1qsK09QJhY -&redirect_uri=https://pixel-composer.com/verify"; - _url += $"&state={port}"; - - url_open(_url); + if(!IS_PATREON) { + var _url = @"www.patreon.com/oauth2/authorize?response_type=code + &client_id=oZ1PNvUY61uH0FiA7ZPMBy77Xau3Ok9tfvsT_Y8DQwyKeMNjaVC35r1qsK09QJhY + &redirect_uri=https://pixel-composer.com/verify"; + _url += $"&state={port}"; + + url_open(_url); + } #endregion \ No newline at end of file diff --git a/scripts/node_canvas_group/node_canvas_group.gml b/scripts/node_canvas_group/node_canvas_group.gml index 14139c2aa..3d9996cae 100644 --- a/scripts/node_canvas_group/node_canvas_group.gml +++ b/scripts/node_canvas_group/node_canvas_group.gml @@ -246,8 +246,8 @@ function Node_Canvas_Group(_x, _y, _group) : Node_Collection(_x, _y, _group) con _output.inputs[0].setFrom(_compose.outputs[0]); } - static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { - if(canvas_sel) canvas_sel.drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); + static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, params) { + if(canvas_sel) canvas_sel.drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny, params); } static drawTools = function(_mx, _my, xx, yy, tool_size, hover, focus) {