Merge pull request #3052 from Atlante45/misc_fixes

Misc fixes
This commit is contained in:
Brad Hefta-Gaub 2014-06-19 18:19:45 -07:00
commit 4ab30aae2b
2 changed files with 2 additions and 2 deletions

View file

@ -1119,8 +1119,8 @@ function handeMenuEvent(menuItem){
Models.editModel(editModelID, properties); Models.editModel(editModelID, properties);
} }
} }
tooltip.show(false);
} }
tooltip.show(false);
} }
Menu.menuItemEvent.connect(handeMenuEvent); Menu.menuItemEvent.connect(handeMenuEvent);

View file

@ -1196,7 +1196,7 @@ function menuItemEvent(menuItem) {
print("deleting..."); print("deleting...");
if (isImporting) { if (isImporting) {
cancelImport(); cancelImport();
} else { } else if (voxelToolSelected) {
Clipboard.deleteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s); Clipboard.deleteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
} }
} }