Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup/bl_operators/object.py')
-rw-r--r--release/scripts/startup/bl_operators/object.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 4ade55c0af6..8268d7a9514 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -489,7 +489,7 @@ class JoinUVs(Operator):
# seems to be the fastest way to create an array
uv_array = array.array('f', [0.0] * 2) * nbr_loops
- mesh.uv_loop_layers.active.data.foreach_get("uv", uv_array)
+ mesh.uv_layers.active.data.foreach_get("uv", uv_array)
objects = context.selected_editable_objects[:]
@@ -516,10 +516,10 @@ class JoinUVs(Operator):
),
)
else:
- uv_other = mesh_other.uv_loop_layers.active
+ uv_other = mesh_other.uv_layers.active
if not uv_other:
mesh_other.uv_textures.new()
- uv_other = mesh_other.uv_loop_layers.active
+ uv_other = mesh_other.uv_layers.active
if not uv_other:
self.report({'ERROR'}, "Could not add "
"a new UV map tp object "