Merge branch 'v2.x' into refactoring-editor

This commit is contained in:
oc 2019-05-02 23:50:17 +08:00
commit 0bab9452ac

View File

@ -972,7 +972,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
var icon = core.getFlag("heroIcon", "hero.png"); var icon = core.getFlag("heroIcon", "hero.png");
icon = core.getMappedName(icon); icon = core.getMappedName(icon);
if (core.material.images.images[icon]) { if (core.material.images.images[icon]) {
core.material.images.hero.src = core.material.images.images[icon].src; core.material.images.hero = core.material.images.images[icon];
core.material.icons.hero.width = core.material.images.images[icon].width / 4; core.material.icons.hero.width = core.material.images.images[icon].width / 4;
core.material.icons.hero.height = core.material.images.images[icon].height / 4; core.material.icons.hero.height = core.material.images.images[icon].height / 4;
} }