diff --git a/Godot-MToon-Shader/mtoon.shader b/addons/Godot-MToon-Shader/mtoon.shader similarity index 100% rename from Godot-MToon-Shader/mtoon.shader rename to addons/Godot-MToon-Shader/mtoon.shader diff --git a/Godot-MToon-Shader/mtoon_cull_off.shader b/addons/Godot-MToon-Shader/mtoon_cull_off.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_cull_off.shader rename to addons/Godot-MToon-Shader/mtoon_cull_off.shader diff --git a/Godot-MToon-Shader/mtoon_outline.shader b/addons/Godot-MToon-Shader/mtoon_outline.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_outline.shader rename to addons/Godot-MToon-Shader/mtoon_outline.shader diff --git a/Godot-MToon-Shader/mtoon_trans.shader b/addons/Godot-MToon-Shader/mtoon_trans.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_trans.shader rename to addons/Godot-MToon-Shader/mtoon_trans.shader diff --git a/Godot-MToon-Shader/mtoon_trans_cull_off.shader b/addons/Godot-MToon-Shader/mtoon_trans_cull_off.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_trans_cull_off.shader rename to addons/Godot-MToon-Shader/mtoon_trans_cull_off.shader diff --git a/Godot-MToon-Shader/mtoon_trans_zwrite.shader b/addons/Godot-MToon-Shader/mtoon_trans_zwrite.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_trans_zwrite.shader rename to addons/Godot-MToon-Shader/mtoon_trans_zwrite.shader diff --git a/Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader b/addons/Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader similarity index 100% rename from Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader rename to addons/Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader diff --git a/MToonCompat/mtooncompat.shader b/addons/MToonCompat/mtooncompat.shader similarity index 100% rename from MToonCompat/mtooncompat.shader rename to addons/MToonCompat/mtooncompat.shader diff --git a/MToonCompat/mtooncompat_cull_off.shader b/addons/MToonCompat/mtooncompat_cull_off.shader similarity index 100% rename from MToonCompat/mtooncompat_cull_off.shader rename to addons/MToonCompat/mtooncompat_cull_off.shader diff --git a/MToonCompat/mtooncompat_outline.shader b/addons/MToonCompat/mtooncompat_outline.shader similarity index 100% rename from MToonCompat/mtooncompat_outline.shader rename to addons/MToonCompat/mtooncompat_outline.shader diff --git a/MToonCompat/mtooncompat_trans.shader b/addons/MToonCompat/mtooncompat_trans.shader similarity index 100% rename from MToonCompat/mtooncompat_trans.shader rename to addons/MToonCompat/mtooncompat_trans.shader diff --git a/MToonCompat/mtooncompat_trans_cull_off.shader b/addons/MToonCompat/mtooncompat_trans_cull_off.shader similarity index 100% rename from MToonCompat/mtooncompat_trans_cull_off.shader rename to addons/MToonCompat/mtooncompat_trans_cull_off.shader diff --git a/MToonCompat/mtooncompat_trans_zwrite.shader b/addons/MToonCompat/mtooncompat_trans_zwrite.shader similarity index 100% rename from MToonCompat/mtooncompat_trans_zwrite.shader rename to addons/MToonCompat/mtooncompat_trans_zwrite.shader diff --git a/MToonCompat/mtooncompat_trans_zwrite_cull_off.shader b/addons/MToonCompat/mtooncompat_trans_zwrite_cull_off.shader similarity index 100% rename from MToonCompat/mtooncompat_trans_zwrite_cull_off.shader rename to addons/MToonCompat/mtooncompat_trans_zwrite_cull_off.shader diff --git a/addons/vrm/import_vrm.gd b/addons/vrm/import_vrm.gd index 33d7fdc..86e6050 100644 --- a/addons/vrm/import_vrm.gd +++ b/addons/vrm/import_vrm.gd @@ -134,8 +134,8 @@ func _process_vrm_material(orig_mat: SpatialMaterial, gltf_images: Array, vrm_ma printerr("VRM Material " + orig_mat.resource_name + " uses screenspace outlines.") - var mtooncompat_shader_base_path = "res://MToonCompat/mtooncompat" - var mtoon_shader_base_path = "res://Godot-MToon-Shader/mtoon" + var mtooncompat_shader_base_path = "res://addons/MToonCompat/mtooncompat" + var mtoon_shader_base_path = "res://addons/Godot-MToon-Shader/mtoon" if USE_COMPAT_SHADER: mtoon_shader_base_path = mtooncompat_shader_base_path diff --git a/vrm/thirdparty/alicia/Alicia_body.material b/vrm/thirdparty/alicia/Alicia_body.material index ac7b578..ea871e8 100644 Binary files a/vrm/thirdparty/alicia/Alicia_body.material and b/vrm/thirdparty/alicia/Alicia_body.material differ diff --git a/vrm/thirdparty/alicia/Alicia_body_wear.material b/vrm/thirdparty/alicia/Alicia_body_wear.material index 3008abf..634f737 100644 Binary files a/vrm/thirdparty/alicia/Alicia_body_wear.material and b/vrm/thirdparty/alicia/Alicia_body_wear.material differ diff --git a/vrm/thirdparty/alicia/Alicia_eye.material b/vrm/thirdparty/alicia/Alicia_eye.material index 739f802..1355174 100644 Binary files a/vrm/thirdparty/alicia/Alicia_eye.material and b/vrm/thirdparty/alicia/Alicia_eye.material differ diff --git a/vrm/thirdparty/alicia/Alicia_eye_white.material b/vrm/thirdparty/alicia/Alicia_eye_white.material index 2bea6f1..40e23cf 100644 Binary files a/vrm/thirdparty/alicia/Alicia_eye_white.material and b/vrm/thirdparty/alicia/Alicia_eye_white.material differ diff --git a/vrm/thirdparty/alicia/Alicia_face.material b/vrm/thirdparty/alicia/Alicia_face.material index aa87e89..169c16e 100644 Binary files a/vrm/thirdparty/alicia/Alicia_face.material and b/vrm/thirdparty/alicia/Alicia_face.material differ diff --git a/vrm/thirdparty/alicia/Alicia_face_mastuge.material b/vrm/thirdparty/alicia/Alicia_face_mastuge.material index 53798af..58d1c21 100644 Binary files a/vrm/thirdparty/alicia/Alicia_face_mastuge.material and b/vrm/thirdparty/alicia/Alicia_face_mastuge.material differ diff --git a/vrm/thirdparty/alicia/Alicia_hair.material b/vrm/thirdparty/alicia/Alicia_hair.material index 6cb2e2b..6c35c26 100644 Binary files a/vrm/thirdparty/alicia/Alicia_hair.material and b/vrm/thirdparty/alicia/Alicia_hair.material differ diff --git a/vrm/thirdparty/alicia/Alicia_hair_trans.material b/vrm/thirdparty/alicia/Alicia_hair_trans.material index 88019db..529b483 100644 Binary files a/vrm/thirdparty/alicia/Alicia_hair_trans.material and b/vrm/thirdparty/alicia/Alicia_hair_trans.material differ diff --git a/vrm/thirdparty/alicia/Alicia_hair_trans_zwrite.material b/vrm/thirdparty/alicia/Alicia_hair_trans_zwrite.material index a129654..a095bae 100644 Binary files a/vrm/thirdparty/alicia/Alicia_hair_trans_zwrite.material and b/vrm/thirdparty/alicia/Alicia_hair_trans_zwrite.material differ diff --git a/vrm/thirdparty/alicia/Alicia_hair_wear.material b/vrm/thirdparty/alicia/Alicia_hair_wear.material index a285ccf..1e1f303 100644 Binary files a/vrm/thirdparty/alicia/Alicia_hair_wear.material and b/vrm/thirdparty/alicia/Alicia_hair_wear.material differ diff --git a/vrm/thirdparty/alicia/Alicia_other_zwrite.material b/vrm/thirdparty/alicia/Alicia_other_zwrite.material index c6e11e6..ace5efe 100644 Binary files a/vrm/thirdparty/alicia/Alicia_other_zwrite.material and b/vrm/thirdparty/alicia/Alicia_other_zwrite.material differ diff --git a/vrm/thirdparty/alicia/Alicia_wear.material b/vrm/thirdparty/alicia/Alicia_wear.material index 904bcb1..9c52517 100644 Binary files a/vrm/thirdparty/alicia/Alicia_wear.material and b/vrm/thirdparty/alicia/Alicia_wear.material differ