mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-21 21:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Use the correct "controller" when "tool" param is specified in app.useTool()

Browse Source 
Fix regression introduced in 1ec502d242ddddadf497c9738986edcaed55000b
This commit is contained in:
David Capello 2020-05-28 12:01:34 -03:00
parent 6d2ddf877b
commit 7a74aef1a7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/script/app_object.cpp
View File

@ -293,15 +293,17 @@ int App_useTool(lua_State* L)
lua_pop(L, 1); lua_pop(L, 1);
// Select tool by name // Select tool by name
const int buttonIdx = (params.button == tools::ToolLoop::Left ? 0: 1);
auto activeToolMgr = App::instance()->activeToolManager(); auto activeToolMgr = App::instance()->activeToolManager();
params.tool = activeToolMgr->activeTool(); params.tool = activeToolMgr->activeTool();
params.ink = params.tool->getInk(params.button == tools::ToolLoop::Left ? 0: 1); params.ink = params.tool->getInk(buttonIdx);
params.controller = params.tool->getController(params.button); params.controller = params.tool->getController(buttonIdx);
type = lua_getfield(L, 1, "tool"); type = lua_getfield(L, 1, "tool");
if (type != LUA_TNIL) { if (type != LUA_TNIL) {
if (auto toolArg = get_tool_from_arg(L, -1)) { if (auto toolArg = get_tool_from_arg(L, -1)) {
params.tool = toolArg; params.tool = toolArg;
params.ink = params.tool->getInk(0); params.ink = params.tool->getInk(buttonIdx);
params.controller = params.tool->getController(buttonIdx);
} }
else else
return luaL_error(L, "invalid tool specified in app.useTool() function"); return luaL_error(L, "invalid tool specified in app.useTool() function");