archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T41983: Array regression with center-verts

Browse Source 
Array with rotation and a central pivot would fail.

Thanks to Bastien Montagne for the initial fix.
This commit is contained in:
Campbell Barton
2014-10-03 14:33:50 +02:00
parent bc0411f687
commit 4c43fcf791
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/modifiers/intern/MOD_array.c
View File

@@ -406,6 +406,9 @@ static DerivedMesh *arrayModifier_doArray(
const bool use_merge = amd->flags & MOD_ARR_MERGE; const bool use_merge = amd->flags & MOD_ARR_MERGE;
const bool use_recalc_normals = (dm->dirty & DM_DIRTY_NORMALS) || use_merge; const bool use_recalc_normals = (dm->dirty & DM_DIRTY_NORMALS) || use_merge;
const bool use_offset_ob = ((amd->offset_type & MOD_ARR_OFF_OBJ) && amd->offset_ob);
/* allow pole vertices to be used by many faces */
const bool with_follow = use_offset_ob;
int start_cap_nverts = 0, start_cap_nedges = 0, start_cap_npolys = 0, start_cap_nloops = 0; int start_cap_nverts = 0, start_cap_nedges = 0, start_cap_npolys = 0, start_cap_nloops = 0;
int end_cap_nverts = 0, end_cap_nedges = 0, end_cap_npolys = 0, end_cap_nloops = 0; int end_cap_nverts = 0, end_cap_nedges = 0, end_cap_npolys = 0, end_cap_nloops = 0;
@@ -454,7 +457,7 @@ static DerivedMesh *arrayModifier_doArray(
offset[3][j] += amd->scale[j] * vertarray_size(src_mvert, chunk_nverts, j); offset[3][j] += amd->scale[j] * vertarray_size(src_mvert, chunk_nverts, j);
} }
if ((amd->offset_type & MOD_ARR_OFF_OBJ) && (amd->offset_ob)) { if (use_offset_ob) {
float obinv[4][4]; float obinv[4][4];
float result_mat[4][4]; float result_mat[4][4];
@@ -606,12 +609,14 @@ static DerivedMesh *arrayModifier_doArray(
int target = full_doubles_map[prev_chunk_index]; int target = full_doubles_map[prev_chunk_index];
if (target != -1) { if (target != -1) {
target += chunk_nverts; /* translate mapping */ target += chunk_nverts; /* translate mapping */
if (!with_follow) {
/* The rule here is to not follow mapping to chunk N-2, which could be too far /* The rule here is to not follow mapping to chunk N-2, which could be too far
* so if target vertex was itself mapped, then this vertex is not mapped */ * so if target vertex was itself mapped, then this vertex is not mapped */
if (full_doubles_map[target] != -1) { if (full_doubles_map[target] != -1) {
target = -1; target = -1;
} }
} }
}
full_doubles_map[this_chunk_index] = target; full_doubles_map[this_chunk_index] = target;
} }
} }
@@ -624,7 +629,7 @@ static DerivedMesh *arrayModifier_doArray(
c * chunk_nverts, c * chunk_nverts,
chunk_nverts, chunk_nverts,
amd->merge_dist, amd->merge_dist,
false); with_follow);
} }
} }
} }
@@ -644,7 +649,7 @@ static DerivedMesh *arrayModifier_doArray(
first_chunk_start, first_chunk_start,
first_chunk_nverts, first_chunk_nverts,
amd->merge_dist, amd->merge_dist,
false); with_follow);
} }
/* start capping */ /* start capping */
@@ -711,9 +716,14 @@ static DerivedMesh *arrayModifier_doArray(
if (use_merge) { if (use_merge) {
for (i = 0; i < result_nverts; i++) { for (i = 0; i < result_nverts; i++) {
if (full_doubles_map[i] != -1) { if (full_doubles_map[i] != -1) {
if (i == full_doubles_map[i]) {
full_doubles_map[i] = -1;
}
else {
tot_doubles++; tot_doubles++;
} }
} }
}
if (tot_doubles > 0) { if (tot_doubles > 0) {
result = CDDM_merge_verts(result, full_doubles_map, tot_doubles, CDDM_MERGE_VERTS_DUMP_IF_EQUAL); result = CDDM_merge_verts(result, full_doubles_map, tot_doubles, CDDM_MERGE_VERTS_DUMP_IF_EQUAL);
} }