update plugin

- revert merge of ballance textures
- prepare for naming convension dev
- show icons for virtools group list
This commit is contained in:
2023-11-23 22:34:06 +08:00
parent cb80fa8b03
commit 8e2d7a4133
6 changed files with 369 additions and 362 deletions

View File

@ -2,8 +2,8 @@ import bpy
from bpy_extras.wm_utils.progress_report import ProgressReport
import tempfile, os, typing
from . import PROP_preferences, UTIL_ioport_shared
from . import UTIL_virtools_types, UTIL_functions, UTIL_file_browser, UTIL_blender_mesh
from . import PROP_virtools_group, PROP_virtools_material, PROP_virtools_texture, PROP_virtools_mesh
from . import UTIL_virtools_types, UTIL_functions, UTIL_file_browser, UTIL_blender_mesh, UTIL_ballance_texture
from . import PROP_virtools_group, PROP_virtools_material, PROP_virtools_mesh
from .PyBMap import bmap_wrapper as bmap
class BBP_OT_import_virtools(bpy.types.Operator, UTIL_file_browser.ImportVirtoolsFile, UTIL_ioport_shared.ImportParams, UTIL_ioport_shared.VirtoolsParams):
@ -94,14 +94,14 @@ def _import_virtools_textures(
vttexture.save_image(texpath_to_load)
# detect whether it is ballance texture and load
try_blc_tex: str | None = PROP_virtools_texture.get_ballance_texture_filename(texpath_to_load)
try_blc_tex: str | None = UTIL_ballance_texture.get_ballance_texture_filename(texpath_to_load)
if try_blc_tex:
# load as ballance texture
tex = PROP_virtools_texture.load_ballance_texture(try_blc_tex)
tex = UTIL_ballance_texture.load_ballance_texture(try_blc_tex)
else:
# load as other textures
tex = PROP_virtools_texture.load_other_texture(texpath_to_load)
tex = UTIL_ballance_texture.load_other_texture(texpath_to_load)
# rename and insert it to map
tex.name = UTIL_functions.virtools_name_regulator(vttexture.get_name())