2010-04-11 22:12:30 +00:00
|
|
|
/*
|
2011-10-23 17:52:20 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2020-05-09 17:14:35 +10:00
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2011-10-23 17:52:20 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2005 by the Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
* \ingroup modifiers
|
2014-08-12 13:52:17 +10:00
|
|
|
*
|
|
|
|
* Array modifier: duplicates the object multiple times along an axis.
|
2011-12-29 04:04:27 +00:00
|
|
|
*/
|
|
|
|
|
2010-08-16 05:46:10 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2011-05-09 04:06:48 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2019-02-25 11:56:24 +01:00
|
|
|
#include "BLI_math.h"
|
|
|
|
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BLT_translation.h"
|
|
|
|
|
2010-08-16 05:46:10 +00:00
|
|
|
#include "DNA_curve_types.h"
|
2020-10-01 09:38:00 -05:00
|
|
|
#include "DNA_defaults.h"
|
2018-04-25 16:47:52 +02:00
|
|
|
#include "DNA_mesh_types.h"
|
2010-08-16 05:46:10 +00:00
|
|
|
#include "DNA_meshdata_types.h"
|
|
|
|
#include "DNA_object_types.h"
|
2012-02-11 10:15:11 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "DNA_screen_types.h"
|
2010-08-16 05:46:10 +00:00
|
|
|
|
2021-04-08 15:51:08 +02:00
|
|
|
#include "BKE_anim_path.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BKE_context.h"
|
2013-08-19 09:25:24 +00:00
|
|
|
#include "BKE_curve.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_displist.h"
|
2020-02-10 12:58:59 +01:00
|
|
|
#include "BKE_lib_id.h"
|
|
|
|
#include "BKE_lib_query.h"
|
2017-06-08 09:17:08 +02:00
|
|
|
#include "BKE_mesh.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BKE_modifier.h"
|
2018-03-06 09:57:41 +11:00
|
|
|
#include "BKE_object_deform.h"
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "BKE_screen.h"
|
|
|
|
|
|
|
|
#include "UI_interface.h"
|
|
|
|
#include "UI_resources.h"
|
|
|
|
|
|
|
|
#include "RNA_access.h"
|
2012-10-24 07:24:11 +00:00
|
|
|
|
2020-06-05 10:41:03 -04:00
|
|
|
#include "MOD_ui_common.h"
|
2013-12-26 17:24:42 +06:00
|
|
|
#include "MOD_util.h"
|
|
|
|
|
2017-04-06 15:37:46 +02:00
|
|
|
#include "DEG_depsgraph.h"
|
2018-12-07 15:45:53 +01:00
|
|
|
#include "DEG_depsgraph_query.h"
|
2017-04-06 15:37:46 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
static void initData(ModifierData *md)
|
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ArrayModifierData *amd = (ArrayModifierData *)md;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-10-01 09:38:00 -05:00
|
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(amd, modifier));
|
|
|
|
|
|
|
|
MEMCPY_STRUCT_AFTER(amd, DNA_struct_default_get(ArrayModifierData), modifier);
|
UI: Small Tweaks to Modifier Layouts for Consistency
These changes are smaller, made based on feedback and a pass on all
the layouts for clarity and consistency. The Multires modifier UI will
be addressed in a separate patch. Here is an overview of the changes:
Renaming Options:
- Build: "Start" -> "Start Frame"
- Curve: "From Radius" -> "Size from Radius"
- Screw: "Calc Order" -> "Calculate Order"
- Displace, Warp, Wave: "Texture Coordinates Object" -> "Object"
Move Mode Toggle to Top & Expand:
- Bevel, Boolean, Normal Edit, Subdivision
Use Columns for Tighter Spacing:
- Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap,
Solidify, Warp, Weighted Normal, Wave
Misc:
- Bevel: Set inactive properties for vertex bevel
- Mesh Sequence Cache: Remove box for cache file
- Skin: Don't align "Mark Loose" and "Clear Loose"
- Array: Expand relative offset subpanel by default
- Array: Move start cap, end cap to a new subpanel
- Bevel: Move width type above width
Differential Revision: https://developer.blender.org/D8115
2020-07-02 10:47:02 -04:00
|
|
|
|
2021-02-05 16:23:34 +11:00
|
|
|
/* Open the first sub-panel by default,
|
|
|
|
* it corresponds to Relative offset which is enabled too. */
|
2020-10-29 19:34:29 -05:00
|
|
|
md->ui_expand_flag = UI_PANEL_DATA_EXPAND_ROOT | UI_SUBPANEL_DATA_EXPAND_1;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2020-10-01 18:05:23 +02:00
|
|
|
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ArrayModifierData *amd = (ArrayModifierData *)md;
|
2010-04-11 22:12:30 +00:00
|
|
|
|
2020-10-01 18:05:23 +02:00
|
|
|
walk(userData, ob, (ID **)&amd->start_cap, IDWALK_CB_NOP);
|
|
|
|
walk(userData, ob, (ID **)&amd->end_cap, IDWALK_CB_NOP);
|
|
|
|
walk(userData, ob, (ID **)&amd->curve_ob, IDWALK_CB_NOP);
|
|
|
|
walk(userData, ob, (ID **)&amd->offset_ob, IDWALK_CB_NOP);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2018-02-22 12:54:06 +01:00
|
|
|
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
{
|
|
|
|
ArrayModifierData *amd = (ArrayModifierData *)md;
|
2019-11-04 14:14:03 +01:00
|
|
|
bool need_transform_dependency = false;
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
if (amd->start_cap != NULL) {
|
2018-04-25 16:34:01 +02:00
|
|
|
DEG_add_object_relation(
|
|
|
|
ctx->node, amd->start_cap, DEG_OB_COMP_GEOMETRY, "Array Modifier Start Cap");
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
}
|
|
|
|
if (amd->end_cap != NULL) {
|
2018-04-25 16:34:01 +02:00
|
|
|
DEG_add_object_relation(
|
|
|
|
ctx->node, amd->end_cap, DEG_OB_COMP_GEOMETRY, "Array Modifier End Cap");
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
}
|
|
|
|
if (amd->curve_ob) {
|
2018-02-22 12:54:06 +01:00
|
|
|
DEG_add_object_relation(
|
|
|
|
ctx->node, amd->curve_ob, DEG_OB_COMP_GEOMETRY, "Array Modifier Curve");
|
2018-10-24 12:31:24 +03:00
|
|
|
DEG_add_special_eval_flag(ctx->node, &amd->curve_ob->id, DAG_EVAL_NEED_CURVE_PATH);
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
}
|
|
|
|
if (amd->offset_ob != NULL) {
|
2018-02-22 12:54:06 +01:00
|
|
|
DEG_add_object_relation(
|
|
|
|
ctx->node, amd->offset_ob, DEG_OB_COMP_TRANSFORM, "Array Modifier Offset");
|
2019-11-04 14:14:03 +01:00
|
|
|
need_transform_dependency = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (need_transform_dependency) {
|
|
|
|
DEG_add_modifier_to_transform_relation(ctx->node, "Array Modifier");
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
BLI_INLINE float sum_v3(const float v[3])
|
2012-03-28 22:03:46 +00:00
|
|
|
{
|
2014-08-12 13:52:17 +10:00
|
|
|
return v[0] + v[1] + v[2];
|
|
|
|
}
|
2012-03-28 22:03:46 +00:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Structure used for sorting vertices, when processing doubles */
|
|
|
|
typedef struct SortVertsElem {
|
|
|
|
int vertex_num; /* The original index of the vertex, prior to sorting */
|
|
|
|
float co[3]; /* Its coordinates */
|
|
|
|
float sum_co; /* sum_v3(co), just so we don't do the sum many times. */
|
|
|
|
} SortVertsElem;
|
2012-03-28 22:03:46 +00:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
static int svert_sum_cmp(const void *e1, const void *e2)
|
|
|
|
{
|
2015-01-01 23:26:03 +11:00
|
|
|
const SortVertsElem *sv1 = e1;
|
|
|
|
const SortVertsElem *sv2 = e2;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:15:10 +10:00
|
|
|
if (sv1->sum_co > sv2->sum_co) {
|
2014-08-12 13:52:17 +10:00
|
|
|
return 1;
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
2020-08-07 12:40:29 +02:00
|
|
|
if (sv1->sum_co < sv2->sum_co) {
|
2014-08-12 13:52:17 +10:00
|
|
|
return -1;
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
2020-08-07 12:40:29 +02:00
|
|
|
|
|
|
|
return 0;
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2012-03-28 22:03:46 +00:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
static void svert_from_mvert(SortVertsElem *sv,
|
|
|
|
const MVert *mv,
|
|
|
|
const int i_begin,
|
|
|
|
const int i_end)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = i_begin; i < i_end; i++, sv++, mv++) {
|
|
|
|
sv->vertex_num = i;
|
|
|
|
copy_v3_v3(sv->co, mv->co);
|
|
|
|
sv->sum_co = sum_v3(mv->co);
|
|
|
|
}
|
2012-03-28 22:03:46 +00:00
|
|
|
}
|
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/**
|
|
|
|
* Take as inputs two sets of verts, to be processed for detection of doubles and mapping.
|
|
|
|
* Each set of verts is defined by its start within mverts array and its num_verts;
|
2019-05-01 07:40:07 +10:00
|
|
|
* It builds a mapping for all vertices within source,
|
|
|
|
* to vertices within target, or -1 if no double found.
|
2014-08-12 13:52:17 +10:00
|
|
|
* The int doubles_map[num_verts_source] array must have been allocated by caller.
|
2012-03-30 17:30:56 +00:00
|
|
|
*/
|
2014-08-12 13:52:17 +10:00
|
|
|
static void dm_mvert_map_doubles(int *doubles_map,
|
|
|
|
const MVert *mverts,
|
|
|
|
const int target_start,
|
|
|
|
const int target_num_verts,
|
|
|
|
const int source_start,
|
|
|
|
const int source_num_verts,
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
const float dist)
|
2012-03-30 17:30:56 +00:00
|
|
|
{
|
2015-01-31 17:23:30 +11:00
|
|
|
const float dist3 = ((float)M_SQRT3 + 0.00005f) * dist; /* Just above sqrt(3) */
|
2014-08-12 13:52:17 +10:00
|
|
|
int i_source, i_target, i_target_low_bound, target_end, source_end;
|
|
|
|
SortVertsElem *sorted_verts_target, *sorted_verts_source;
|
|
|
|
SortVertsElem *sve_source, *sve_target, *sve_target_low_bound;
|
|
|
|
bool target_scan_completed;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
target_end = target_start + target_num_verts;
|
|
|
|
source_end = source_start + source_num_verts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* build array of MVerts to be tested for merging */
|
2018-01-14 22:14:20 +01:00
|
|
|
sorted_verts_target = MEM_malloc_arrayN(target_num_verts, sizeof(SortVertsElem), __func__);
|
|
|
|
sorted_verts_source = MEM_malloc_arrayN(source_num_verts, sizeof(SortVertsElem), __func__);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Copy target vertices index and cos into SortVertsElem array */
|
|
|
|
svert_from_mvert(sorted_verts_target, mverts + target_start, target_start, target_end);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Copy source vertices index and cos into SortVertsElem array */
|
|
|
|
svert_from_mvert(sorted_verts_source, mverts + source_start, source_start, source_end);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* sort arrays according to sum of vertex coordinates (sumco) */
|
|
|
|
qsort(sorted_verts_target, target_num_verts, sizeof(SortVertsElem), svert_sum_cmp);
|
|
|
|
qsort(sorted_verts_source, source_num_verts, sizeof(SortVertsElem), svert_sum_cmp);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
sve_target_low_bound = sorted_verts_target;
|
|
|
|
i_target_low_bound = 0;
|
|
|
|
target_scan_completed = false;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Scan source vertices, in SortVertsElem sorted array, */
|
|
|
|
/* all the while maintaining the lower bound of possible doubles in target vertices */
|
|
|
|
for (i_source = 0, sve_source = sorted_verts_source; i_source < source_num_verts;
|
|
|
|
i_source++, sve_source++) {
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
int best_target_vertex = -1;
|
|
|
|
float best_dist_sq = dist * dist;
|
2014-08-12 13:52:17 +10:00
|
|
|
float sve_source_sumco;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* If source has already been assigned to a target (in an earlier call, with other chunks) */
|
|
|
|
if (doubles_map[sve_source->vertex_num] != -1) {
|
|
|
|
continue;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* If target fully scanned already, then all remaining source vertices cannot have a double */
|
|
|
|
if (target_scan_completed) {
|
|
|
|
doubles_map[sve_source->vertex_num] = -1;
|
|
|
|
continue;
|
2012-11-19 14:58:31 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
sve_source_sumco = sum_v3(sve_source->co);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Skip all target vertices that are more than dist3 lower in terms of sumco */
|
|
|
|
/* and advance the overall lower bound, applicable to all remaining vertices as well. */
|
|
|
|
while ((i_target_low_bound < target_num_verts) &&
|
|
|
|
(sve_target_low_bound->sum_co < sve_source_sumco - dist3)) {
|
|
|
|
i_target_low_bound++;
|
|
|
|
sve_target_low_bound++;
|
2012-11-19 14:58:31 +00:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
/* If end of target list reached, then no more possible doubles */
|
|
|
|
if (i_target_low_bound >= target_num_verts) {
|
|
|
|
doubles_map[sve_source->vertex_num] = -1;
|
|
|
|
target_scan_completed = true;
|
|
|
|
continue;
|
2012-11-19 14:58:31 +00:00
|
|
|
}
|
2019-05-01 07:40:07 +10:00
|
|
|
/* Test target candidates starting at the low bound of possible doubles,
|
|
|
|
* ordered in terms of sumco. */
|
2014-08-12 13:52:17 +10:00
|
|
|
i_target = i_target_low_bound;
|
|
|
|
sve_target = sve_target_low_bound;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-05-01 07:40:07 +10:00
|
|
|
/* i_target will scan vertices in the
|
|
|
|
* [v_source_sumco - dist3; v_source_sumco + dist3] range */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
while ((i_target < target_num_verts) && (sve_target->sum_co <= sve_source_sumco + dist3)) {
|
|
|
|
/* Testing distance for candidate double in target */
|
|
|
|
/* v_target is within dist3 of v_source in terms of sumco; check real distance */
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
float dist_sq;
|
|
|
|
if ((dist_sq = len_squared_v3v3(sve_source->co, sve_target->co)) <= best_dist_sq) {
|
|
|
|
/* Potential double found */
|
|
|
|
best_dist_sq = dist_sq;
|
|
|
|
best_target_vertex = sve_target->vertex_num;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
/* If target is already mapped, we only follow that mapping if final target remains
|
|
|
|
* close enough from current vert (otherwise no mapping at all).
|
2019-05-01 07:40:07 +10:00
|
|
|
* Note that if we later find another target closer than this one, then we check it.
|
|
|
|
* But if other potential targets are farther,
|
|
|
|
* then there will be no mapping at all for this source. */
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
while (best_target_vertex != -1 &&
|
|
|
|
!ELEM(doubles_map[best_target_vertex], -1, best_target_vertex)) {
|
|
|
|
if (compare_len_v3v3(mverts[sve_source->vertex_num].co,
|
|
|
|
mverts[doubles_map[best_target_vertex]].co,
|
|
|
|
dist)) {
|
|
|
|
best_target_vertex = doubles_map[best_target_vertex];
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
|
|
|
else {
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
best_target_vertex = -1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
i_target++;
|
|
|
|
sve_target++;
|
|
|
|
}
|
|
|
|
/* End of candidate scan: if none found then no doubles */
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
doubles_map[sve_source->vertex_num] = best_target_vertex;
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
MEM_freeN(sorted_verts_source);
|
|
|
|
MEM_freeN(sorted_verts_target);
|
|
|
|
}
|
2012-03-30 17:30:56 +00:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
static void mesh_merge_transform(Mesh *result,
|
|
|
|
Mesh *cap_mesh,
|
2019-09-14 08:10:50 +10:00
|
|
|
const float cap_offset[4][4],
|
2019-09-19 13:32:36 +10:00
|
|
|
uint cap_verts_index,
|
|
|
|
uint cap_edges_index,
|
2014-08-12 13:52:17 +10:00
|
|
|
int cap_loops_index,
|
|
|
|
int cap_polys_index,
|
2018-03-06 09:57:41 +11:00
|
|
|
int cap_nverts,
|
|
|
|
int cap_nedges,
|
|
|
|
int cap_nloops,
|
|
|
|
int cap_npolys,
|
|
|
|
int *remap,
|
|
|
|
int remap_len)
|
2014-08-12 13:52:17 +10:00
|
|
|
{
|
|
|
|
int *index_orig;
|
|
|
|
int i;
|
|
|
|
MVert *mv;
|
|
|
|
MEdge *me;
|
|
|
|
MLoop *ml;
|
|
|
|
MPoly *mp;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
CustomData_copy_data(&cap_mesh->vdata, &result->vdata, 0, cap_verts_index, cap_nverts);
|
|
|
|
CustomData_copy_data(&cap_mesh->edata, &result->edata, 0, cap_edges_index, cap_nedges);
|
|
|
|
CustomData_copy_data(&cap_mesh->ldata, &result->ldata, 0, cap_loops_index, cap_nloops);
|
|
|
|
CustomData_copy_data(&cap_mesh->pdata, &result->pdata, 0, cap_polys_index, cap_npolys);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
mv = result->mvert + cap_verts_index;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < cap_nverts; i++, mv++) {
|
|
|
|
mul_m4_v3(cap_offset, mv->co);
|
|
|
|
/* Reset MVert flags for caps */
|
|
|
|
mv->flag = mv->bweight = 0;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-03-06 09:57:41 +11:00
|
|
|
/* remap the vertex groups if necessary */
|
2018-12-14 14:44:20 +01:00
|
|
|
if (result->dvert != NULL) {
|
|
|
|
BKE_object_defgroup_index_map_apply(
|
|
|
|
&result->dvert[cap_verts_index], cap_nverts, remap, remap_len);
|
2018-03-06 09:57:41 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* adjust cap edge vertex indices */
|
2018-04-25 16:47:52 +02:00
|
|
|
me = result->medge + cap_edges_index;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < cap_nedges; i++, me++) {
|
|
|
|
me->v1 += cap_verts_index;
|
|
|
|
me->v2 += cap_verts_index;
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* adjust cap poly loopstart indices */
|
2018-04-25 16:47:52 +02:00
|
|
|
mp = result->mpoly + cap_polys_index;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < cap_npolys; i++, mp++) {
|
|
|
|
mp->loopstart += cap_loops_index;
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* adjust cap loop vertex and edge indices */
|
2018-04-25 16:47:52 +02:00
|
|
|
ml = result->mloop + cap_loops_index;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < cap_nloops; i++, ml++) {
|
|
|
|
ml->v += cap_verts_index;
|
|
|
|
ml->e += cap_edges_index;
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* set origindex */
|
2018-04-25 16:47:52 +02:00
|
|
|
index_orig = CustomData_get_layer(&result->vdata, CD_ORIGINDEX);
|
2014-08-12 13:52:17 +10:00
|
|
|
if (index_orig) {
|
2015-05-05 17:08:29 +10:00
|
|
|
copy_vn_i(index_orig + cap_verts_index, cap_nverts, ORIGINDEX_NONE);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
index_orig = CustomData_get_layer(&result->edata, CD_ORIGINDEX);
|
2014-08-12 13:52:17 +10:00
|
|
|
if (index_orig) {
|
2015-05-05 17:08:29 +10:00
|
|
|
copy_vn_i(index_orig + cap_edges_index, cap_nedges, ORIGINDEX_NONE);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
index_orig = CustomData_get_layer(&result->pdata, CD_ORIGINDEX);
|
2014-08-12 13:52:17 +10:00
|
|
|
if (index_orig) {
|
2015-05-05 17:08:29 +10:00
|
|
|
copy_vn_i(index_orig + cap_polys_index, cap_npolys, ORIGINDEX_NONE);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
index_orig = CustomData_get_layer(&result->ldata, CD_ORIGINDEX);
|
2014-08-12 13:52:17 +10:00
|
|
|
if (index_orig) {
|
2015-05-05 17:08:29 +10:00
|
|
|
copy_vn_i(index_orig + cap_loops_index, cap_nloops, ORIGINDEX_NONE);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2012-03-28 22:03:46 +00:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
static Mesh *arrayModifier_doArray(ArrayModifierData *amd,
|
2018-05-01 17:33:04 +02:00
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
Mesh *mesh)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2014-08-12 13:52:17 +10:00
|
|
|
const MVert *src_mvert;
|
|
|
|
MVert *mv, *mv_prev, *result_dm_verts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
MEdge *me;
|
|
|
|
MLoop *ml;
|
|
|
|
MPoly *mp;
|
|
|
|
int i, j, c, count;
|
|
|
|
float length = amd->length;
|
2010-04-11 22:12:30 +00:00
|
|
|
/* offset matrix */
|
|
|
|
float offset[4][4];
|
2014-08-12 13:52:17 +10:00
|
|
|
float scale[3];
|
|
|
|
bool offset_has_scale;
|
|
|
|
float current_offset[4][4];
|
2012-02-13 08:06:44 +00:00
|
|
|
float final_offset[4][4];
|
2014-08-12 13:52:17 +10:00
|
|
|
int *full_doubles_map = NULL;
|
|
|
|
int tot_doubles;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-01-07 11:41:45 +11:00
|
|
|
const bool use_merge = (amd->flags & MOD_ARR_MERGE) != 0;
|
2018-05-04 10:05:57 +02:00
|
|
|
const bool use_recalc_normals = (mesh->runtime.cd_dirty_vert & CD_MASK_NORMAL) || use_merge;
|
2018-12-07 15:45:53 +01:00
|
|
|
const bool use_offset_ob = ((amd->offset_type & MOD_ARR_OFF_OBJ) && amd->offset_ob != NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
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 result_nverts = 0, result_nedges = 0, result_npolys = 0, result_nloops = 0;
|
|
|
|
int chunk_nverts, chunk_nedges, chunk_nloops, chunk_npolys;
|
|
|
|
int first_chunk_start, first_chunk_nverts, last_chunk_start, last_chunk_nverts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
Mesh *result, *start_cap_mesh = NULL, *end_cap_mesh = NULL;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-03-06 09:57:41 +11:00
|
|
|
int *vgroup_start_cap_remap = NULL;
|
|
|
|
int vgroup_start_cap_remap_len = 0;
|
|
|
|
int *vgroup_end_cap_remap = NULL;
|
|
|
|
int vgroup_end_cap_remap_len = 0;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
chunk_nverts = mesh->totvert;
|
|
|
|
chunk_nedges = mesh->totedge;
|
|
|
|
chunk_nloops = mesh->totloop;
|
|
|
|
chunk_npolys = mesh->totpoly;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
count = amd->count;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-26 11:25:07 +01:00
|
|
|
Object *start_cap_ob = amd->start_cap;
|
2019-08-23 15:50:53 +02:00
|
|
|
if (start_cap_ob && start_cap_ob != ctx->object) {
|
2018-05-01 17:33:04 +02:00
|
|
|
vgroup_start_cap_remap = BKE_object_defgroup_index_map_create(
|
2018-12-07 15:45:53 +01:00
|
|
|
start_cap_ob, ctx->object, &vgroup_start_cap_remap_len);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-11 20:20:12 +01:00
|
|
|
start_cap_mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(start_cap_ob, false);
|
2018-04-25 16:47:52 +02:00
|
|
|
if (start_cap_mesh) {
|
|
|
|
start_cap_nverts = start_cap_mesh->totvert;
|
|
|
|
start_cap_nedges = start_cap_mesh->totedge;
|
|
|
|
start_cap_nloops = start_cap_mesh->totloop;
|
|
|
|
start_cap_npolys = start_cap_mesh->totpoly;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-03-26 11:25:07 +01:00
|
|
|
Object *end_cap_ob = amd->end_cap;
|
2019-08-23 15:50:53 +02:00
|
|
|
if (end_cap_ob && end_cap_ob != ctx->object) {
|
2018-05-01 17:33:04 +02:00
|
|
|
vgroup_end_cap_remap = BKE_object_defgroup_index_map_create(
|
2018-12-07 15:45:53 +01:00
|
|
|
end_cap_ob, ctx->object, &vgroup_end_cap_remap_len);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-02-11 20:20:12 +01:00
|
|
|
end_cap_mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(end_cap_ob, false);
|
2018-04-25 16:47:52 +02:00
|
|
|
if (end_cap_mesh) {
|
|
|
|
end_cap_nverts = end_cap_mesh->totvert;
|
|
|
|
end_cap_nedges = end_cap_mesh->totedge;
|
|
|
|
end_cap_nloops = end_cap_mesh->totloop;
|
|
|
|
end_cap_npolys = end_cap_mesh->totpoly;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Build up offset array, cumulating all settings options */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
unit_m4(offset);
|
2018-04-25 16:47:52 +02:00
|
|
|
src_mvert = mesh->mvert;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 09:17:08 +02:00
|
|
|
if (amd->offset_type & MOD_ARR_OFF_CONST) {
|
|
|
|
add_v3_v3(offset[3], amd->offset);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (amd->offset_type & MOD_ARR_OFF_RELATIVE) {
|
2017-06-08 09:17:08 +02:00
|
|
|
float min[3], max[3];
|
|
|
|
const MVert *src_mv;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 09:17:08 +02:00
|
|
|
INIT_MINMAX(min, max);
|
|
|
|
for (src_mv = src_mvert, j = chunk_nverts; j--; src_mv++) {
|
|
|
|
minmax_v3v3_v3(min, max, src_mv->co);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-06-08 09:17:08 +02:00
|
|
|
for (j = 3; j--;) {
|
|
|
|
offset[3][j] += amd->scale[j] * (max[j] - min[j]);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2017-06-08 09:17:08 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-10-03 14:33:50 +02:00
|
|
|
if (use_offset_ob) {
|
2010-04-11 22:12:30 +00:00
|
|
|
float obinv[4][4];
|
|
|
|
float result_mat[4][4];
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:15:10 +10:00
|
|
|
if (ctx->object) {
|
2018-05-01 17:33:04 +02:00
|
|
|
invert_m4_m4(obinv, ctx->object->obmat);
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
|
|
|
else {
|
2010-04-11 22:12:30 +00:00
|
|
|
unit_m4(obinv);
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-03-26 11:25:07 +01:00
|
|
|
mul_m4_series(result_mat, offset, obinv, amd->offset_ob->obmat);
|
2010-04-11 22:12:30 +00:00
|
|
|
copy_m4_m4(offset, result_mat);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Check if there is some scaling. If scaling, then we will not translate mapping */
|
|
|
|
mat4_to_size(scale, offset);
|
|
|
|
offset_has_scale = !is_one_v3(scale);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-07 15:45:53 +01:00
|
|
|
if (amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob != NULL) {
|
2019-03-26 11:25:07 +01:00
|
|
|
Object *curve_ob = amd->curve_ob;
|
2019-08-23 15:50:53 +02:00
|
|
|
CurveCache *curve_cache = curve_ob->runtime.curve_cache;
|
2021-04-08 15:51:08 +02:00
|
|
|
if (curve_cache != NULL && curve_cache->anim_path_accum_length != NULL) {
|
2019-08-23 15:50:53 +02:00
|
|
|
float scale_fac = mat4_to_scale(curve_ob->obmat);
|
2021-04-08 15:51:08 +02:00
|
|
|
length = scale_fac * BKE_anim_path_get_length(curve_cache);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2013-11-18 14:02:49 +13:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-23 14:47:06 +02:00
|
|
|
/* About 67 million vertices max seems a decent limit for now. */
|
|
|
|
const size_t max_num_vertices = 1 << 26;
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* calculate the maximum number of copies which will fit within the
|
2012-03-09 18:28:30 +00:00
|
|
|
* prescribed length */
|
2020-11-06 12:30:59 +11:00
|
|
|
if (ELEM(amd->fit_type, MOD_ARR_FITLENGTH, MOD_ARR_FITCURVE)) {
|
2020-04-23 14:47:06 +02:00
|
|
|
const float float_epsilon = 1e-6f;
|
|
|
|
bool offset_is_too_small = false;
|
2013-09-03 22:32:03 +00:00
|
|
|
float dist = len_v3(offset[3]);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-04-23 14:47:06 +02:00
|
|
|
if (dist > float_epsilon) {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* this gives length = first copy start to last copy end
|
2012-03-09 18:28:30 +00:00
|
|
|
* add a tiny offset for floating point rounding errors */
|
2020-04-23 14:47:06 +02:00
|
|
|
count = (length + float_epsilon) / dist + 1;
|
|
|
|
|
|
|
|
/* Ensure we keep things to a reasonable level, in terms of rough total amount of generated
|
|
|
|
* vertices.
|
|
|
|
*/
|
|
|
|
if (((size_t)count * (size_t)chunk_nverts + (size_t)start_cap_nverts +
|
|
|
|
(size_t)end_cap_nverts) > max_num_vertices) {
|
|
|
|
count = 1;
|
|
|
|
offset_is_too_small = true;
|
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
|
|
|
else {
|
2010-04-11 22:12:30 +00:00
|
|
|
/* if the offset has no translation, just make one copy */
|
|
|
|
count = 1;
|
2020-04-23 14:47:06 +02:00
|
|
|
offset_is_too_small = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset_is_too_small) {
|
2020-05-08 10:14:02 +02:00
|
|
|
BKE_modifier_set_error(
|
2020-10-26 17:07:58 +11:00
|
|
|
ctx->object,
|
2020-04-23 14:47:06 +02:00
|
|
|
&amd->modifier,
|
|
|
|
"The offset is too small, we cannot generate the amount of geometry it would require");
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2020-04-23 14:47:06 +02:00
|
|
|
/* Ensure we keep things to a reasonable level, in terms of rough total amount of generated
|
|
|
|
* vertices.
|
|
|
|
*/
|
|
|
|
else if (((size_t)count * (size_t)chunk_nverts + (size_t)start_cap_nverts +
|
|
|
|
(size_t)end_cap_nverts) > max_num_vertices) {
|
|
|
|
count = 1;
|
2020-10-26 17:07:58 +11:00
|
|
|
BKE_modifier_set_error(ctx->object,
|
|
|
|
&amd->modifier,
|
2020-05-08 19:02:03 +10:00
|
|
|
"The amount of copies is too high, we cannot generate the amount of "
|
|
|
|
"geometry it would require");
|
2020-04-23 14:47:06 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-22 09:15:10 +10:00
|
|
|
if (count < 1) {
|
2010-07-19 04:44:37 +00:00
|
|
|
count = 1;
|
2019-04-22 09:15:10 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* The number of verts, edges, loops, polys, before eventually merging doubles */
|
|
|
|
result_nverts = chunk_nverts * count + start_cap_nverts + end_cap_nverts;
|
|
|
|
result_nedges = chunk_nedges * count + start_cap_nedges + end_cap_nedges;
|
|
|
|
result_nloops = chunk_nloops * count + start_cap_nloops + end_cap_nloops;
|
|
|
|
result_npolys = chunk_npolys * count + start_cap_npolys + end_cap_npolys;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Initialize a result dm */
|
2018-05-08 17:06:30 +02:00
|
|
|
result = BKE_mesh_new_nomain_from_template(
|
|
|
|
mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys);
|
2018-04-25 16:47:52 +02:00
|
|
|
result_dm_verts = result->mvert;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge) {
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Will need full_doubles_map for handling merge */
|
2018-01-14 22:14:20 +01:00
|
|
|
full_doubles_map = MEM_malloc_arrayN(result_nverts, sizeof(int), "mod array doubles map");
|
2015-05-05 17:08:29 +10:00
|
|
|
copy_vn_i(full_doubles_map, result_nverts, -1);
|
2012-03-26 19:50:45 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* copy customdata to original geometry */
|
2018-04-25 16:47:52 +02:00
|
|
|
CustomData_copy_data(&mesh->vdata, &result->vdata, 0, 0, chunk_nverts);
|
|
|
|
CustomData_copy_data(&mesh->edata, &result->edata, 0, 0, chunk_nedges);
|
|
|
|
CustomData_copy_data(&mesh->ldata, &result->ldata, 0, 0, chunk_nloops);
|
|
|
|
CustomData_copy_data(&mesh->pdata, &result->pdata, 0, 0, chunk_npolys);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-09-03 16:49:08 +02:00
|
|
|
/* Subsurf for eg won't have mesh data in the custom data arrays.
|
2018-04-25 12:25:47 +02:00
|
|
|
* now add mvert/medge/mpoly layers. */
|
2018-04-25 16:47:52 +02:00
|
|
|
if (!CustomData_has_layer(&mesh->vdata, CD_MVERT)) {
|
|
|
|
memcpy(result->mvert, mesh->mvert, sizeof(*result->mvert) * mesh->totvert);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2018-04-25 16:47:52 +02:00
|
|
|
if (!CustomData_has_layer(&mesh->edata, CD_MEDGE)) {
|
|
|
|
memcpy(result->medge, mesh->medge, sizeof(*result->medge) * mesh->totedge);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2018-04-25 16:47:52 +02:00
|
|
|
if (!CustomData_has_layer(&mesh->pdata, CD_MPOLY)) {
|
|
|
|
memcpy(result->mloop, mesh->mloop, sizeof(*result->mloop) * mesh->totloop);
|
|
|
|
memcpy(result->mpoly, mesh->mpoly, sizeof(*result->mpoly) * mesh->totpoly);
|
2012-11-20 13:29:27 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Remember first chunk, in case of cap merge */
|
|
|
|
first_chunk_start = 0;
|
|
|
|
first_chunk_nverts = chunk_nverts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
unit_m4(current_offset);
|
|
|
|
for (c = 1; c < count; c++) {
|
|
|
|
/* copy customdata to new geometry */
|
2018-04-25 16:47:52 +02:00
|
|
|
CustomData_copy_data(&mesh->vdata, &result->vdata, 0, c * chunk_nverts, chunk_nverts);
|
|
|
|
CustomData_copy_data(&mesh->edata, &result->edata, 0, c * chunk_nedges, chunk_nedges);
|
|
|
|
CustomData_copy_data(&mesh->ldata, &result->ldata, 0, c * chunk_nloops, chunk_nloops);
|
|
|
|
CustomData_copy_data(&mesh->pdata, &result->pdata, 0, c * chunk_npolys, chunk_npolys);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
mv_prev = result_dm_verts;
|
|
|
|
mv = mv_prev + c * chunk_nverts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* recalculate cumulative offset here */
|
|
|
|
mul_m4_m4m4(current_offset, current_offset, offset);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* apply offset to all new verts */
|
|
|
|
for (i = 0; i < chunk_nverts; i++, mv++, mv_prev++) {
|
|
|
|
mul_m4_v3(current_offset, mv->co);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-09-21 10:12:26 +02:00
|
|
|
/* We have to correct normals too, if we do not tag them as dirty! */
|
|
|
|
if (!use_recalc_normals) {
|
|
|
|
float no[3];
|
|
|
|
normal_short_to_float_v3(no, mv->no);
|
|
|
|
mul_mat3_m4_v3(current_offset, no);
|
|
|
|
normalize_v3(no);
|
|
|
|
normal_float_to_short_v3(mv->no, no);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-09-21 10:12:26 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* adjust edge vertex indices */
|
2018-04-25 16:47:52 +02:00
|
|
|
me = result->medge + c * chunk_nedges;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < chunk_nedges; i++, me++) {
|
|
|
|
me->v1 += c * chunk_nverts;
|
|
|
|
me->v2 += c * chunk_nverts;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
mp = result->mpoly + c * chunk_npolys;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < chunk_npolys; i++, mp++) {
|
|
|
|
mp->loopstart += c * chunk_nloops;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* adjust loop vertex and edge indices */
|
2018-04-25 16:47:52 +02:00
|
|
|
ml = result->mloop + c * chunk_nloops;
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < chunk_nloops; i++, ml++) {
|
|
|
|
ml->v += c * chunk_nverts;
|
|
|
|
ml->e += c * chunk_nedges;
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Handle merge between chunk n and n-1 */
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge && (c >= 1)) {
|
2014-08-12 13:52:17 +10:00
|
|
|
if (!offset_has_scale && (c >= 2)) {
|
|
|
|
/* Mapping chunk 3 to chunk 2 is a translation of mapping 2 to 1
|
|
|
|
* ... that is except if scaling makes the distance grow */
|
|
|
|
int k;
|
|
|
|
int this_chunk_index = c * chunk_nverts;
|
|
|
|
int prev_chunk_index = (c - 1) * chunk_nverts;
|
|
|
|
for (k = 0; k < chunk_nverts; k++, this_chunk_index++, prev_chunk_index++) {
|
|
|
|
int target = full_doubles_map[prev_chunk_index];
|
|
|
|
if (target != -1) {
|
|
|
|
target += chunk_nverts; /* translate mapping */
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
while (target != -1 && !ELEM(full_doubles_map[target], -1, target)) {
|
|
|
|
/* If target is already mapped, we only follow that mapping if final target remains
|
|
|
|
* close enough from current vert (otherwise no mapping at all). */
|
|
|
|
if (compare_len_v3v3(result_dm_verts[this_chunk_index].co,
|
|
|
|
result_dm_verts[full_doubles_map[target]].co,
|
|
|
|
amd->merge_dist)) {
|
2014-10-05 23:10:44 +02:00
|
|
|
target = full_doubles_map[target];
|
|
|
|
}
|
|
|
|
else {
|
2014-10-03 14:33:50 +02:00
|
|
|
target = -1;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
}
|
2014-10-03 14:33:50 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
full_doubles_map[this_chunk_index] = target;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2012-04-21 12:51:47 +00:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
else {
|
|
|
|
dm_mvert_map_doubles(full_doubles_map,
|
|
|
|
result_dm_verts,
|
|
|
|
(c - 1) * chunk_nverts,
|
|
|
|
chunk_nverts,
|
|
|
|
c * chunk_nverts,
|
|
|
|
chunk_nverts,
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
amd->merge_dist);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2017-12-07 04:33:52 +11:00
|
|
|
/* handle UVs */
|
|
|
|
if (chunk_nloops > 0 && is_zero_v2(amd->uv_offset) == false) {
|
2018-04-25 16:47:52 +02:00
|
|
|
const int totuv = CustomData_number_of_layers(&result->ldata, CD_MLOOPUV);
|
2017-12-07 04:33:52 +11:00
|
|
|
for (i = 0; i < totuv; i++) {
|
2018-04-25 16:47:52 +02:00
|
|
|
MLoopUV *dmloopuv = CustomData_get_layer_n(&result->ldata, CD_MLOOPUV, i);
|
2017-12-07 04:33:52 +11:00
|
|
|
dmloopuv += chunk_nloops;
|
|
|
|
for (c = 1; c < count; c++) {
|
|
|
|
const float uv_offset[2] = {
|
|
|
|
amd->uv_offset[0] * (float)c,
|
|
|
|
amd->uv_offset[1] * (float)c,
|
|
|
|
};
|
|
|
|
int l_index = chunk_nloops;
|
|
|
|
for (; l_index-- != 0; dmloopuv++) {
|
|
|
|
dmloopuv->uv[0] += uv_offset[0];
|
|
|
|
dmloopuv->uv[1] += uv_offset[1];
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-12-07 04:33:52 +11:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
last_chunk_start = (count - 1) * chunk_nverts;
|
|
|
|
last_chunk_nverts = chunk_nverts;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
copy_m4_m4(final_offset, current_offset);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge && (amd->flags & MOD_ARR_MERGEFINAL) && (count > 1)) {
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Merge first and last copies */
|
|
|
|
dm_mvert_map_doubles(full_doubles_map,
|
|
|
|
result_dm_verts,
|
|
|
|
last_chunk_start,
|
|
|
|
last_chunk_nverts,
|
|
|
|
first_chunk_start,
|
|
|
|
first_chunk_nverts,
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
amd->merge_dist);
|
2012-03-30 17:30:56 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-02-13 08:06:44 +00:00
|
|
|
/* start capping */
|
2018-04-25 16:47:52 +02:00
|
|
|
if (start_cap_mesh) {
|
2014-08-12 13:52:17 +10:00
|
|
|
float start_offset[4][4];
|
|
|
|
int start_cap_start = result_nverts - start_cap_nverts - end_cap_nverts;
|
|
|
|
invert_m4_m4(start_offset, offset);
|
2018-04-25 16:47:52 +02:00
|
|
|
mesh_merge_transform(result,
|
|
|
|
start_cap_mesh,
|
|
|
|
start_offset,
|
2014-08-12 13:52:17 +10:00
|
|
|
result_nverts - start_cap_nverts - end_cap_nverts,
|
|
|
|
result_nedges - start_cap_nedges - end_cap_nedges,
|
|
|
|
result_nloops - start_cap_nloops - end_cap_nloops,
|
|
|
|
result_npolys - start_cap_npolys - end_cap_npolys,
|
2018-03-06 09:57:41 +11:00
|
|
|
start_cap_nverts,
|
|
|
|
start_cap_nedges,
|
|
|
|
start_cap_nloops,
|
|
|
|
start_cap_npolys,
|
|
|
|
vgroup_start_cap_remap,
|
|
|
|
vgroup_start_cap_remap_len);
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Identify doubles with first chunk */
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge) {
|
2014-08-12 13:52:17 +10:00
|
|
|
dm_mvert_map_doubles(full_doubles_map,
|
|
|
|
result_dm_verts,
|
|
|
|
first_chunk_start,
|
|
|
|
first_chunk_nverts,
|
|
|
|
start_cap_start,
|
|
|
|
start_cap_nverts,
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
amd->merge_dist);
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2012-02-13 08:06:44 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-04-25 16:47:52 +02:00
|
|
|
if (end_cap_mesh) {
|
2014-08-12 13:52:17 +10:00
|
|
|
float end_offset[4][4];
|
|
|
|
int end_cap_start = result_nverts - end_cap_nverts;
|
|
|
|
mul_m4_m4m4(end_offset, current_offset, offset);
|
2018-04-25 16:47:52 +02:00
|
|
|
mesh_merge_transform(result,
|
|
|
|
end_cap_mesh,
|
|
|
|
end_offset,
|
2014-08-12 13:52:17 +10:00
|
|
|
result_nverts - end_cap_nverts,
|
|
|
|
result_nedges - end_cap_nedges,
|
|
|
|
result_nloops - end_cap_nloops,
|
|
|
|
result_npolys - end_cap_npolys,
|
2018-03-06 09:57:41 +11:00
|
|
|
end_cap_nverts,
|
|
|
|
end_cap_nedges,
|
|
|
|
end_cap_nloops,
|
|
|
|
end_cap_npolys,
|
|
|
|
vgroup_end_cap_remap,
|
|
|
|
vgroup_end_cap_remap_len);
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Identify doubles with last chunk */
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge) {
|
2014-08-12 13:52:17 +10:00
|
|
|
dm_mvert_map_doubles(full_doubles_map,
|
|
|
|
result_dm_verts,
|
|
|
|
last_chunk_start,
|
|
|
|
last_chunk_nverts,
|
|
|
|
end_cap_start,
|
|
|
|
end_cap_nverts,
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
amd->merge_dist);
|
2012-02-13 08:06:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* done capping */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-08-12 13:52:17 +10:00
|
|
|
/* Handle merging */
|
|
|
|
tot_doubles = 0;
|
2014-09-21 10:12:26 +02:00
|
|
|
if (use_merge) {
|
2014-08-12 13:52:17 +10:00
|
|
|
for (i = 0; i < result_nverts; i++) {
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
int new_i = full_doubles_map[i];
|
|
|
|
if (new_i != -1) {
|
2019-05-01 07:40:07 +10:00
|
|
|
/* We have to follow chains of doubles
|
|
|
|
* (merge start/end especially is likely to create some),
|
2018-10-15 18:11:37 +11:00
|
|
|
* those are not supported at all by BKE_mesh_merge_verts! */
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
while (!ELEM(full_doubles_map[new_i], -1, new_i)) {
|
|
|
|
new_i = full_doubles_map[new_i];
|
|
|
|
}
|
|
|
|
if (i == new_i) {
|
2014-10-03 14:33:50 +02:00
|
|
|
full_doubles_map[i] = -1;
|
|
|
|
}
|
|
|
|
else {
|
Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.
That was the main issue (in both T46455 and T46690), solved by 'flattening' those chains (v1 -> v2 ->v3 etc.)
before calling `CDDM_merge_verts()`.
Also added note to `CDDM_merge_verts()` that it does not support chained mapping, along with
a basic assert that should catch most of those cases in future.
The logic of 'following mapping' was also rather broken, making a special case here when using
object-controlled offset is very weak. Further more, blindly following mapping in this case
was far from ideal, this could end to merging vertices rather far from each other.
To address this issue, we now always follow mapping, but only as long as 'final' vertex remains
close enough from mapped one.
Finally, the search of 'closest' vertex to merge with was also quite bad, would just pick the first
one matching distance limit, instead of using the actual closest one - could lead to rather ugly
geometry deformations in case one would use not-so-small merge threashold!
2016-01-30 17:17:05 +01:00
|
|
|
full_doubles_map[i] = new_i;
|
2014-10-03 14:33:50 +02:00
|
|
|
tot_doubles++;
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2014-10-03 14:33:50 +02:00
|
|
|
}
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
|
|
|
if (tot_doubles > 0) {
|
2018-04-25 16:47:52 +02:00
|
|
|
result = BKE_mesh_merge_verts(
|
|
|
|
result, full_doubles_map, tot_doubles, MESH_MERGE_VERTS_DUMP_IF_EQUAL);
|
2014-08-12 13:52:17 +10:00
|
|
|
}
|
|
|
|
MEM_freeN(full_doubles_map);
|
2012-03-27 13:08:40 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-05-04 10:05:57 +02:00
|
|
|
/* In case org dm has dirty normals, or we made some merging, mark normals as dirty in new mesh!
|
|
|
|
* TODO: we may need to set other dirty flags as well?
|
|
|
|
*/
|
2014-10-04 12:52:06 +02:00
|
|
|
if (use_recalc_normals) {
|
2018-05-04 10:05:57 +02:00
|
|
|
result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
|
2014-10-04 12:52:06 +02:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-03-06 09:57:41 +11:00
|
|
|
if (vgroup_start_cap_remap) {
|
|
|
|
MEM_freeN(vgroup_start_cap_remap);
|
|
|
|
}
|
|
|
|
if (vgroup_end_cap_remap) {
|
|
|
|
MEM_freeN(vgroup_end_cap_remap);
|
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-02-12 15:02:33 +00:00
|
|
|
return result;
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2020-04-21 13:09:41 +02:00
|
|
|
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
|
2010-04-11 22:12:30 +00:00
|
|
|
{
|
2012-05-06 13:38:33 +00:00
|
|
|
ArrayModifierData *amd = (ArrayModifierData *)md;
|
2018-05-01 17:33:04 +02:00
|
|
|
return arrayModifier_doArray(amd, ctx, mesh);
|
2010-04-11 22:12:30 +00:00
|
|
|
}
|
|
|
|
|
2019-08-23 15:50:53 +02:00
|
|
|
static bool isDisabled(const struct Scene *UNUSED(scene),
|
|
|
|
ModifierData *md,
|
|
|
|
bool UNUSED(useRenderParams))
|
|
|
|
{
|
|
|
|
ArrayModifierData *amd = (ArrayModifierData *)md;
|
|
|
|
|
|
|
|
/* The object type check is only needed here in case we have a placeholder
|
|
|
|
* object assigned (because the library containing the curve/mesh is missing).
|
|
|
|
*
|
2019-08-31 01:19:22 +10:00
|
|
|
* In other cases it should be impossible to have a type mismatch.
|
2019-08-23 15:50:53 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
if (amd->curve_ob && amd->curve_ob->type != OB_CURVE) {
|
|
|
|
return true;
|
|
|
|
}
|
2020-08-07 12:40:29 +02:00
|
|
|
if (amd->start_cap && amd->start_cap->type != OB_MESH) {
|
2019-08-23 15:50:53 +02:00
|
|
|
return true;
|
|
|
|
}
|
2020-08-07 12:40:29 +02:00
|
|
|
if (amd->end_cap && amd->end_cap->type != OB_MESH) {
|
2019-08-23 15:50:53 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
|
|
|
PointerRNA ob_ptr;
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "fit_type", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
int fit_type = RNA_enum_get(ptr, "fit_type");
|
2020-06-05 10:41:03 -04:00
|
|
|
if (fit_type == MOD_ARR_FIXEDCOUNT) {
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "count", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
else if (fit_type == MOD_ARR_FITLENGTH) {
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "fit_length", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
else if (fit_type == MOD_ARR_FITCURVE) {
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "curve", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
modifier_panel_end(layout, ptr);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void relative_offset_header_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "use_relative_offset", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void relative_offset_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
uiLayout *col = uiLayoutColumn(layout, false);
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_relative_offset"));
|
|
|
|
uiItemR(col, ptr, "relative_offset_displace", 0, IFACE_("Factor"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void constant_offset_header_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "use_constant_offset", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void constant_offset_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
uiLayout *col = uiLayoutColumn(layout, false);
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_constant_offset"));
|
|
|
|
uiItemR(col, ptr, "constant_offset_displace", 0, IFACE_("Distance"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Object offset in a subpanel for consistency with the other offset types.
|
|
|
|
*/
|
2020-09-02 14:13:26 -05:00
|
|
|
static void object_offset_header_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "use_object_offset", 0, NULL, ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void object_offset_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
uiLayout *col = uiLayoutColumn(layout, false);
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_object_offset"));
|
|
|
|
uiItemR(col, ptr, "offset_object", 0, IFACE_("Object"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void symmetry_panel_header_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(layout, ptr, "use_merge_vertices", 0, IFACE_("Merge"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void symmetry_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
uiLayout *col = uiLayoutColumn(layout, false);
|
2020-09-02 14:13:26 -05:00
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_merge_vertices"));
|
|
|
|
uiItemR(col, ptr, "merge_threshold", 0, IFACE_("Distance"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_merge_vertices_cap", 0, IFACE_("First and Last Copies"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void uv_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
2020-06-05 10:41:03 -04:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
2020-06-05 10:41:03 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
col = uiLayoutColumn(layout, true);
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(col, ptr, "offset_u", UI_ITEM_R_EXPAND, IFACE_("Offset U"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "offset_v", UI_ITEM_R_EXPAND, IFACE_("V"), ICON_NONE);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
static void caps_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
UI: Small Tweaks to Modifier Layouts for Consistency
These changes are smaller, made based on feedback and a pass on all
the layouts for clarity and consistency. The Multires modifier UI will
be addressed in a separate patch. Here is an overview of the changes:
Renaming Options:
- Build: "Start" -> "Start Frame"
- Curve: "From Radius" -> "Size from Radius"
- Screw: "Calc Order" -> "Calculate Order"
- Displace, Warp, Wave: "Texture Coordinates Object" -> "Object"
Move Mode Toggle to Top & Expand:
- Bevel, Boolean, Normal Edit, Subdivision
Use Columns for Tighter Spacing:
- Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap,
Solidify, Warp, Weighted Normal, Wave
Misc:
- Bevel: Set inactive properties for vertex bevel
- Mesh Sequence Cache: Remove box for cache file
- Skin: Don't align "Mark Loose" and "Clear Loose"
- Array: Expand relative offset subpanel by default
- Array: Move start cap, end cap to a new subpanel
- Bevel: Move width type above width
Differential Revision: https://developer.blender.org/D8115
2020-07-02 10:47:02 -04:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
2020-09-02 14:13:26 -05:00
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
UI: Small Tweaks to Modifier Layouts for Consistency
These changes are smaller, made based on feedback and a pass on all
the layouts for clarity and consistency. The Multires modifier UI will
be addressed in a separate patch. Here is an overview of the changes:
Renaming Options:
- Build: "Start" -> "Start Frame"
- Curve: "From Radius" -> "Size from Radius"
- Screw: "Calc Order" -> "Calculate Order"
- Displace, Warp, Wave: "Texture Coordinates Object" -> "Object"
Move Mode Toggle to Top & Expand:
- Bevel, Boolean, Normal Edit, Subdivision
Use Columns for Tighter Spacing:
- Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap,
Solidify, Warp, Weighted Normal, Wave
Misc:
- Bevel: Set inactive properties for vertex bevel
- Mesh Sequence Cache: Remove box for cache file
- Skin: Don't align "Mark Loose" and "Clear Loose"
- Array: Expand relative offset subpanel by default
- Array: Move start cap, end cap to a new subpanel
- Bevel: Move width type above width
Differential Revision: https://developer.blender.org/D8115
2020-07-02 10:47:02 -04:00
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
|
|
|
col = uiLayoutColumn(layout, false);
|
2020-09-02 14:13:26 -05:00
|
|
|
uiItemR(col, ptr, "start_cap", 0, IFACE_("Cap Start"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "end_cap", 0, IFACE_("End"), ICON_NONE);
|
UI: Small Tweaks to Modifier Layouts for Consistency
These changes are smaller, made based on feedback and a pass on all
the layouts for clarity and consistency. The Multires modifier UI will
be addressed in a separate patch. Here is an overview of the changes:
Renaming Options:
- Build: "Start" -> "Start Frame"
- Curve: "From Radius" -> "Size from Radius"
- Screw: "Calc Order" -> "Calculate Order"
- Displace, Warp, Wave: "Texture Coordinates Object" -> "Object"
Move Mode Toggle to Top & Expand:
- Bevel, Boolean, Normal Edit, Subdivision
Use Columns for Tighter Spacing:
- Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap,
Solidify, Warp, Weighted Normal, Wave
Misc:
- Bevel: Set inactive properties for vertex bevel
- Mesh Sequence Cache: Remove box for cache file
- Skin: Don't align "Mark Loose" and "Clear Loose"
- Array: Expand relative offset subpanel by default
- Array: Move start cap, end cap to a new subpanel
- Bevel: Move width type above width
Differential Revision: https://developer.blender.org/D8115
2020-07-02 10:47:02 -04:00
|
|
|
}
|
|
|
|
|
2020-06-05 10:41:03 -04:00
|
|
|
static void panelRegister(ARegionType *region_type)
|
|
|
|
{
|
|
|
|
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Array, panel_draw);
|
|
|
|
modifier_subpanel_register(region_type,
|
|
|
|
"relative_offset",
|
|
|
|
"",
|
|
|
|
relative_offset_header_draw,
|
|
|
|
relative_offset_draw,
|
|
|
|
panel_type);
|
|
|
|
modifier_subpanel_register(region_type,
|
|
|
|
"constant_offset",
|
|
|
|
"",
|
|
|
|
constant_offset_header_draw,
|
|
|
|
constant_offset_draw,
|
|
|
|
panel_type);
|
|
|
|
modifier_subpanel_register(
|
|
|
|
region_type, "object_offset", "", object_offset_header_draw, object_offset_draw, panel_type);
|
|
|
|
modifier_subpanel_register(
|
|
|
|
region_type, "merge", "", symmetry_panel_header_draw, symmetry_panel_draw, panel_type);
|
|
|
|
modifier_subpanel_register(region_type, "uv", "UVs", NULL, uv_panel_draw, panel_type);
|
UI: Small Tweaks to Modifier Layouts for Consistency
These changes are smaller, made based on feedback and a pass on all
the layouts for clarity and consistency. The Multires modifier UI will
be addressed in a separate patch. Here is an overview of the changes:
Renaming Options:
- Build: "Start" -> "Start Frame"
- Curve: "From Radius" -> "Size from Radius"
- Screw: "Calc Order" -> "Calculate Order"
- Displace, Warp, Wave: "Texture Coordinates Object" -> "Object"
Move Mode Toggle to Top & Expand:
- Bevel, Boolean, Normal Edit, Subdivision
Use Columns for Tighter Spacing:
- Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap,
Solidify, Warp, Weighted Normal, Wave
Misc:
- Bevel: Set inactive properties for vertex bevel
- Mesh Sequence Cache: Remove box for cache file
- Skin: Don't align "Mark Loose" and "Clear Loose"
- Array: Expand relative offset subpanel by default
- Array: Move start cap, end cap to a new subpanel
- Bevel: Move width type above width
Differential Revision: https://developer.blender.org/D8115
2020-07-02 10:47:02 -04:00
|
|
|
modifier_subpanel_register(region_type, "caps", "Caps", NULL, caps_panel_draw, panel_type);
|
2020-06-05 10:41:03 -04:00
|
|
|
}
|
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
ModifierTypeInfo modifierType_Array = {
|
|
|
|
/* name */ "Array",
|
|
|
|
/* structName */ "ArrayModifierData",
|
|
|
|
/* structSize */ sizeof(ArrayModifierData),
|
2020-09-25 12:49:18 +02:00
|
|
|
/* srna */ &RNA_ArrayModifier,
|
2010-04-11 22:12:30 +00:00
|
|
|
/* type */ eModifierTypeType_Constructive,
|
2012-05-06 13:38:33 +00:00
|
|
|
/* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping |
|
|
|
|
eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode |
|
|
|
|
eModifierTypeFlag_AcceptsCVs,
|
2020-09-25 12:45:30 +02:00
|
|
|
/* icon */ ICON_MOD_ARRAY,
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-05-08 10:14:02 +02:00
|
|
|
/* copyData */ BKE_modifier_copydata_generic,
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2011-03-05 10:29:10 +00:00
|
|
|
/* deformVerts */ NULL,
|
|
|
|
/* deformMatrices */ NULL,
|
|
|
|
/* deformVertsEM */ NULL,
|
|
|
|
/* deformMatricesEM */ NULL,
|
2020-04-21 13:09:41 +02:00
|
|
|
/* modifyMesh */ modifyMesh,
|
|
|
|
/* modifyHair */ NULL,
|
2020-12-10 14:35:02 +01:00
|
|
|
/* modifyGeometrySet */ NULL,
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-04-11 22:12:30 +00:00
|
|
|
/* initData */ initData,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* requiredDataMask */ NULL,
|
|
|
|
/* freeData */ NULL,
|
2019-08-23 15:50:53 +02:00
|
|
|
/* isDisabled */ isDisabled,
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 15:05:57 +05:00
|
|
|
/* updateDepsgraph */ updateDepsgraph,
|
2011-03-05 10:29:10 +00:00
|
|
|
/* dependsOnTime */ NULL,
|
|
|
|
/* dependsOnNormals */ NULL,
|
2020-10-01 18:05:23 +02:00
|
|
|
/* foreachIDLink */ foreachIDLink,
|
2011-08-12 18:11:22 +00:00
|
|
|
/* foreachTexLink */ NULL,
|
2019-03-18 15:56:16 +01:00
|
|
|
/* freeRuntimeData */ NULL,
|
2020-06-05 10:41:03 -04:00
|
|
|
/* panelRegister */ panelRegister,
|
2020-06-15 17:37:07 +02:00
|
|
|
/* blendWrite */ NULL,
|
|
|
|
/* blendRead */ NULL,
|
2010-04-11 22:12:30 +00:00
|
|
|
};
|