Merge branch 'main' of https://github.com/armory3d/armortools

paint/sources/import_asset.ts

@@ -8,8 +8,10 @@ let _import_asset_done: ()=>void;
 function import_asset_run(path: string, drop_x: f32 = -1.0, drop_y: f32 = -1.0, show_box: bool = true, hdr_as_envmap: bool = true, done: ()=>void = null) {
 
 	if (starts_with(path, "cloud")) {
-		///if (arm_android || arm_ios)
+		///if arm_android
 		console_toast(tr("Downloading"));
+		///else
+		console_info(tr("Downloading"));
 		///end
 
 		_import_asset_drop_x = drop_x;

paint/sources/import_envmap.ts

@@ -57,6 +57,7 @@ function import_envmap_run(path: string, image: gpu_texture_t) {
 	scene_world._.radiance = import_envmap_radiance;
 	scene_world._.radiance_mipmaps = import_envmap_mips;
 	context_raw.saved_envmap = image;
+	context_raw.show_envmap = true;
 	if (context_raw.show_envmap_blur) {
 		scene_world._.envmap = scene_world._.radiance_mipmaps[0];
 	}

paint/sources/ui_base.ts

@@ -105,6 +105,9 @@ function ui_base_init() {
 	scene_world._.envmap = context_raw.show_envmap ? context_raw.saved_envmap : context_raw.empty_envmap;
 	context_raw.ddirty = 1;
 
+	let resources: string[] = ["cursor.k", "icons.k"];
+	resource_load(resources);
+
 	let scale: f32 = config_raw.window_scale;
 	let ops: ui_options_t = {
 		theme: base_theme,
@@ -133,9 +136,6 @@ function ui_base_init() {
 	context_raw.gizmo_rotate_y = object_get_child(context_raw.gizmo, ".RotateY");
 	context_raw.gizmo_rotate_z = object_get_child(context_raw.gizmo, ".RotateZ");
 
-	let resources: string[] = ["cursor.k", "icons.k"];
-	resource_load(resources);
-
 	project_new(false);
 
 	if (project_filepath == "") {

paint/sources/ui_menubar.ts

@@ -345,6 +345,7 @@ function ui_menubar_draw_category_items() {
 			context_raw.ddirty = 2;
 		}
 
+		context_raw.show_envmap_handle.selected = context_raw.show_envmap;
 		context_raw.show_envmap = ui_check(context_raw.show_envmap_handle, " " + tr("Envmap"));
 		if (context_raw.show_envmap_handle.changed) {
 			context_load_envmap();