edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merged object fix

Browse Source
This commit is contained in:
luboslenco
2018-11-08 10:28:34 +01:00
parent 0591fcc695
commit cef5075fdd
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+3 -1
View File
@@ -199,7 +199,9 @@ class App extends iron.Trait {
var right = appw / 2 + modalW / 2; var right = appw / 2 + modalW / 2;
var top = apph / 2 - modalH / 2; var top = apph / 2 - modalH / 2;
var bottom = apph / 2 + modalH / 2; var bottom = apph / 2 + modalH / 2;
if (mouse.x < left || mouse.x > right || mouse.y < top || mouse.y > bottom) { var mx = mouse.x + iron.App.x();
var my = mouse.y + iron.App.y();
if (mx < left || mx > right || my < top || my > bottom) {
showFiles = false; showFiles = false;
} }
} }
Sources/arm/UITrait.hx
+7
View File
@@ -2671,6 +2671,13 @@ void main() {
// Import is synchronous for now // Import is synchronous for now
scaleToBounds(); scaleToBounds();
if (mergedObject != null) {
mergedObject.remove();
iron.data.Data.deleteMesh(mergedObject.data.handle);
mergedObject = null;
}
selectPaintObject(paintObjects[0]);
if (paintObjects.length > 1) { if (paintObjects.length > 1) {
objectsHandle.selected = true; objectsHandle.selected = true;