diff --git a/README.md b/README.md index 0aea101..90504cb 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Used BM file spec can be found in [there](https://github.com/yyc12345/gist/blob/ Used tools chain principle and the file format located in `meshes` can be found in [there](https://github.com/yyc12345/gist/blob/master/BMFileSpec/YYCToolsChainSpec_ZH.md) (Chinese only). The format of the files which are under the `jsons` folder and belong to the BMERevenge section, can be found in [here](https://github.com/yyc12345/gist/blob/master/BMERevenge/DevDocument_ZH.md) (Chinese only). -This plugin will continuously support Blender lastest **LTS** version. This plugin will migrate to new version when the new LTS version released. Currently, it based on Blender **3.3.x**. +This plugin will continuously support Blender lastest **LTS** version. This plugin will migrate to new version when the new LTS version released. Currently, it based on Blender **3.6.x**. ## Installation diff --git a/README_ZH.md b/README_ZH.md index 12fb3fc..1946c2c 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -17,7 +17,7 @@ 使用的制图链标准以及`meshes`文件夹下的文件的格式可以在[这里](https://github.com/yyc12345/gist/blob/master/BMFileSpec/YYCToolsChainSpec_ZH.md)查找 `jsons`文件夹下的，隶属于BMERevenge部分的文件的格式可以在[这里](https://github.com/yyc12345/gist/blob/master/BMERevenge/DevDocument_ZH.md)查找 -支持Blender的原则是支持当前最新的 **LTS** 版本，在最新的LTS版本释出之后会花一些时间迁移插件。当前插件基于**3.3.x**版本 +支持Blender的原则是支持当前最新的 **LTS** 版本，在最新的LTS版本释出之后会花一些时间迁移插件。当前插件基于**3.6.x**版本 ## 安装 diff --git a/ballance_blender_plugin/BMFILE_export.py b/ballance_blender_plugin/BMFILE_export.py index 9e0bfe8..5372f9e 100644 --- a/ballance_blender_plugin/BMFILE_export.py +++ b/ballance_blender_plugin/BMFILE_export.py @@ -173,14 +173,14 @@ def export_bm(context, bmx_filepath, prefs_fncg, opts_exportMode, opts_exportTar mesh_faceIndexPairs = [(face, index) for index, face in enumerate(mesh.polygons)] UTILS_file_io.write_uint32(fmesh, len(mesh_faceIndexPairs) * 3) if mesh.uv_layers.active is not None: - uv_layer = mesh.uv_layers.active.data[:] + uv_layer = mesh.uv_layers.active.uv for f, f_index in mesh_faceIndexPairs: # it should be triangle face, otherwise throw a error if (f.loop_total != 3): raise Exception("Not a triangle", f.poly.loop_total) for loop_index in range(f.loop_start, f.loop_start + f.loop_total): - uv = uv_layer[loop_index].uv + uv = uv_layer[loop_index].vector # reverse v UTILS_file_io.write_2vector(fmesh, uv[0], -uv[1]) else: @@ -318,6 +318,8 @@ def export_bm(context, bmx_filepath, prefs_fncg, opts_exportMode, opts_exportTar # get absolute texture path texture_filepath = io_utils.path_reference(texture.filepath, texture_blenderFilePath, utils_tempTextureFolder, 'ABSOLUTE', "", None, texture.library) + # texture_filepath = bpy.path.abspath(texture.filepath, start=texture_blenderFilePath, library=texture.library) + # get file name and write it texture_filename = os.path.basename(texture_filepath) UTILS_file_io.write_string(ftexture, texture_filename) diff --git a/ballance_blender_plugin/BMFILE_import.py b/ballance_blender_plugin/BMFILE_import.py index 0018d37..a68cbba 100644 --- a/ballance_blender_plugin/BMFILE_import.py +++ b/ballance_blender_plugin/BMFILE_import.py @@ -260,10 +260,10 @@ def import_bm(context, bmx_filepath, prefs_fncg, prefs_externalTexture, prefs_te mesh_target.vertices.foreach_set("co", unpack_list(mesh_vList)) mesh_target.loops.foreach_set("vertex_index", unpack_list(_flat_vertices_index(mesh_faceList))) mesh_target.loops.foreach_set("normal", unpack_list(_flat_vertices_normal(mesh_faceList, mesh_vnList))) - mesh_target.uv_layers[0].data.foreach_set("uv", unpack_list(_flat_vertices_uv(mesh_faceList, mesh_vtList))) + mesh_target.uv_layers[0].uv.foreach_set("vector", unpack_list(_flat_vertices_uv(mesh_faceList, mesh_vtList))) # Blender 3.5 CHANGED for i in range(len(mesh_faceList)): mesh_target.polygons[i].loop_start = i * 3 - mesh_target.polygons[i].loop_total = 3 + # mesh_target.polygons[i].loop_total = 3 # Blender 3.6 CHANGED if mesh_faceList[i][9] != -1: mesh_target.polygons[i].material_index = mesh_faceList[i][9] diff --git a/ballance_blender_plugin/MODS_flatten_uv.py b/ballance_blender_plugin/MODS_flatten_uv.py index fa5d14d..381f35d 100644 --- a/ballance_blender_plugin/MODS_flatten_uv.py +++ b/ballance_blender_plugin/MODS_flatten_uv.py @@ -110,7 +110,7 @@ def _real_flatten_uv(mesh, reference_edge, scale_data: ScaleDataUnion): mesh.uv_layers.new(do_init=False) bm = bmesh.from_edit_mesh(mesh) - uv_lay = bm.loops.layers.uv.active + uv_lay = bm.loops.layers.uv.active # NOTE: this is a part of bmesh. not affected by Blender 3.5 CHANGED. for face in bm.faces: # ========== only process selected face ========== if not face.select: diff --git a/ballance_blender_plugin/MODS_rail_uv.py b/ballance_blender_plugin/MODS_rail_uv.py index 3b7f13c..8164b04 100644 --- a/ballance_blender_plugin/MODS_rail_uv.py +++ b/ballance_blender_plugin/MODS_rail_uv.py @@ -141,15 +141,17 @@ def _create_rail_uv(rail_type, material_pointer, scale_size, projection_axis): ) real_scale = 1.0 / maxLength - uv_layer = mesh.uv_layers.active.data + # Blender 3.5 CHANGED: mesh.uv_layers.active.data -> mesh.uv_layers.active.uv + # .uv -> .vector + uv_layer = mesh.uv_layers.active.uv for poly in mesh.polygons: for loop_index in range(poly.loop_start, poly.loop_start + poly.loop_total): # get correspond vec index index = mesh.loops[loop_index].vertex_index if rail_type == 'POINT': # set to 1 point - uv_layer[loop_index].uv[0] = 0 - uv_layer[loop_index].uv[1] = 1 + uv_layer[loop_index].vector[0] = 0 + uv_layer[loop_index].vector[1] = 1 elif rail_type == 'SCALE' or rail_type == 'UNIFORM': # following xy -> uv scale # @@ -157,16 +159,16 @@ def _create_rail_uv(rail_type, material_pointer, scale_size, projection_axis): # use X axis: Y->U Z->V # use Y axis: X->U Z->V if projection_axis == 'X': - uv_layer[loop_index].uv[0] = vecList[index].co[1] * real_scale - uv_layer[loop_index].uv[1] = vecList[index].co[2] * real_scale + uv_layer[loop_index].vector[0] = vecList[index].co[1] * real_scale + uv_layer[loop_index].vector[1] = vecList[index].co[2] * real_scale elif projection_axis == 'Y': - uv_layer[loop_index].uv[0] = vecList[index].co[0] * real_scale - uv_layer[loop_index].uv[1] = vecList[index].co[2] * real_scale + uv_layer[loop_index].vector[0] = vecList[index].co[0] * real_scale + uv_layer[loop_index].vector[1] = vecList[index].co[2] * real_scale elif projection_axis == 'Z': - uv_layer[loop_index].uv[0] = vecList[index].co[0] * real_scale - uv_layer[loop_index].uv[1] = vecList[index].co[1] * real_scale + uv_layer[loop_index].vector[0] = vecList[index].co[0] * real_scale + uv_layer[loop_index].vector[1] = vecList[index].co[1] * real_scale elif rail_type == 'TT': - (uv_layer[loop_index].uv[0], uv_layer[loop_index].uv[1]) = _tt_reflection_mapping_compute( + (uv_layer[loop_index].vector[0], uv_layer[loop_index].vector[1]) = _tt_reflection_mapping_compute( vecList[index].co, mesh.loops[loop_index].normal, (0.0, 0.0, 0.0) diff --git a/ballance_blender_plugin/OBJS_add_floors.py b/ballance_blender_plugin/OBJS_add_floors.py index 4cdbaab..ee47999 100644 --- a/ballance_blender_plugin/OBJS_add_floors.py +++ b/ballance_blender_plugin/OBJS_add_floors.py @@ -469,13 +469,18 @@ def _load_basic_floor(mesh, floor_type, rotation, height_multiplier, d1, d2, sid _virtual_foreach_set(mesh.vertices, "co", global_offset_vec, vecList) _virtual_foreach_set(mesh.loops, "vertex_index", global_offset_loops, faceList) _virtual_foreach_set(mesh.loops, "normal", global_offset_loops, normalList) - _virtual_foreach_set(mesh.uv_layers[0].data, "uv", global_offset_loops, uvList) + # Blender 3.5 CHANGED. MeshUVLoop is deprecated and removed in 4.0 + # See https://wiki.blender.org/wiki/Reference/Release_Notes/3.5/Python_API + # use MeshUVLoopLayer.uv[i].vector instead. MeshUVLoopLayer can be fetched from `mesh.uv_layers[i]` or `mesh.uv_layers.active` + _virtual_foreach_set(mesh.uv_layers[0].uv, "vector", global_offset_loops, uvList) cache_counter = 0 for i in range(len(faceMatList)): indCount = faceIndList[i] mesh.polygons[i + global_offset_polygons].loop_start = global_offset_loops + cache_counter - mesh.polygons[i + global_offset_polygons].loop_total = indCount + # Blender 3.6 CHANGED. loop_total is readonly now. the count of consumed vertices is decided by next loop's loop_start + # See: https://wiki.blender.org/wiki/Reference/Release_Notes/3.6/Python_API + # mesh.polygons[i + global_offset_polygons].loop_total = indCount mesh.polygons[i + global_offset_polygons].material_index = faceMatList[i] mesh.polygons[i + global_offset_polygons].use_smooth = True cache_counter += indCount diff --git a/ballance_blender_plugin/UTILS_functions.py b/ballance_blender_plugin/UTILS_functions.py index 040b893..cf08455 100644 --- a/ballance_blender_plugin/UTILS_functions.py +++ b/ballance_blender_plugin/UTILS_functions.py @@ -178,8 +178,7 @@ def load_component(component_id): mesh.loops.foreach_set("normal", unpack_list(_flat_component_vertices_normal(faceList, vnList))) for i in range(len(faceList)): mesh.polygons[i].loop_start = i * 3 - mesh.polygons[i].loop_total = 3 - + # mesh.polygons[i].loop_total = 3 # Blender 3.6 CHANGED mesh.polygons[i].use_smooth = True mesh.validate(clean_customdata=False) diff --git a/ballance_blender_plugin/__init__.py b/ballance_blender_plugin/__init__.py index cd8564a..8770bef 100644 --- a/ballance_blender_plugin/__init__.py +++ b/ballance_blender_plugin/__init__.py @@ -3,9 +3,9 @@ bl_info={ "description":"Ballance mapping tools for Blender", "author":"yyc12345", "version":(3,2), - "blender":(3,3,0), + "blender":(3,6,0), "category":"Object", - "support":"TESTING", + "support":"COMMUNITY", "warning": "Please read document before using this plugin.", "wiki_url": "https://github.com/yyc12345/BallanceBlenderHelper", "tracker_url": "https://github.com/yyc12345/BallanceBlenderHelper/issues"