tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity
tornavis/source/blender/makesdna/DNA_modifier_defaults.h

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

1086 lines
27 KiB
C
Raw Normal View History

License Headers: Set copyright to "Blender Authors", add AUTHORS Listing the "Blender Foundation" as copyright holder implied the Blender Foundation holds copyright to files which may include work from many developers. While keeping copyright on headers makes sense for isolated libraries, Blender's own code may be refactored or moved between files in a way that makes the per file copyright holders less meaningful. Copyright references to the "Blender Foundation" have been replaced with "Blender Authors", with the exception of `./extern/` since these this contains libraries which are more isolated, any changed to license headers there can be handled on a case-by-case basis. Some directories in `./intern/` have also been excluded: - `./intern/cycles/` it's own `AUTHORS` file is planned. - `./intern/opensubdiv/`. An "AUTHORS" file has been added, using the chromium projects authors file as a template. Design task: #110784 Ref !110783.
2023-08-15 16:20:26 +02:00
/* SPDX-FileCopyrightText: 2023 Blender Authors
Cleanup: Add a copyright notice to files and use SPDX format A lot of files were missing copyright field in the header and the Blender Foundation contributed to them in a sense of bug fixing and general maintenance. This change makes it explicit that those files are at least partially copyrighted by the Blender Foundation. Note that this does not make it so the Blender Foundation is the only holder of the copyright in those files, and developers who do not have a signed contract with the foundation still hold the copyright as well. Another aspect of this change is using SPDX format for the header. We already used it for the license specification, and now we state it for the copyright as well, following the FAQ: https://reuse.software/faq/
2023-05-31 16:19:06 +02:00
*
* SPDX-License-Identifier: GPL-2.0-or-later */
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
/** \file
* \ingroup DNA
*/
#pragma once
/* clang-format off */
#define _DNA_DEFAULT_ArmatureModifierData \
{ \
.deformflag = ARM_DEF_VGROUP, \
.multi = 0.0f, \
.object = NULL, \
.defgrp_name = "", \
}
/* Default to 2 duplicates distributed along the x-axis by an offset of 1 object width. */
#define _DNA_DEFAULT_ArrayModifierData \
{ \
.start_cap = NULL, \
.end_cap = NULL, \
.curve_ob = NULL, \
.offset_ob = NULL, \
.offset = {1.0f, 0.0f, 0.0f}, \
.scale = {1.0f, 0.0f, 0.0f}, \
.length = 0.0f, \
Fix T81672: Array modifier default merge distance is 0.1m (typo) Seems to be an oversight/typo in rB83980506957c. Now set back to 0.01m (as it was before). Maniphest Tasks: T81672 Differential Revision: https://developer.blender.org/D9193
2020-10-13 13:40:05 +02:00
.merge_dist = 0.01f, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.fit_type = MOD_ARR_FIXEDCOUNT, \
.offset_type = MOD_ARR_OFF_RELATIVE, \
.flags = 0, \
.count = 2, \
.uv_offset = {0.0f, 0.0f}, \
}
#define _DNA_DEFAULT_BevelModifierData \
{ \
.value = 0.1f, \
.res = 1, \
.flags = 0, \
.val_flags = MOD_BEVEL_AMT_OFFSET, \
.profile_type = MOD_BEVEL_PROFILE_SUPERELLIPSE, \
Bevel Modifier: Use angle limit method by default This right click select post outlines the reasons to make "Angle" the default limit method: https://blender.community/c/rightclickselect/BVfbbc/ In short: Beveling every single edge rather than just sharp edges is rarely the desired behavior, and the placement of the property in the UI makes it easy to see the property's importance and toggle it. Differential Revision: https://developer.blender.org/D8961
2021-01-13 01:55:27 +01:00
.lim_flags = MOD_BEVEL_ANGLE, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.e_flags = 0, \
.mat = -1, \
.edge_flags = 0, \
.face_str_mode = MOD_BEVEL_FACE_STRENGTH_NONE, \
.miter_inner = MOD_BEVEL_MITER_SHARP, \
.miter_outer = MOD_BEVEL_MITER_SHARP, \
.affect_type = MOD_BEVEL_AFFECT_EDGES, \
.profile = 0.5f, \
.bevel_angle = DEG2RADF(30.0f), \
.spread = 0.1f, \
.defgrp_name = "", \
}
#define _DNA_DEFAULT_BooleanModifierData \
{ \
.object = NULL, \
.collection = NULL, \
.double_threshold = 1e-6f, \
.operation = eBooleanModifierOp_Difference, \
Geometry Nodes: Add float solver to mesh boolean node This adds a "Solver" option to the geo boolean node, with the options Exact and Float. The current geo boolean node only uses the Exact solver. This adds the ability to use the faster original floating point boolean solver. The float solver has issues with coplanar and other coincident geometry, but is generally much faster than the Exact solver, and users have asked for this option (which is available in the Boolean Modifier and edit mode boolean tool). Like the modifier, the Float solver needs to convert the Mesh to BMesh, do the operation, and then convert back to Mesh. It also has to do it iteratively if more than two operands are supplied. This is the first of a planned series of commits that will add a new exact boolean solver, based on the Ember paper, as a solver option. Ember will be much faster than the current exact solver, but may still not be as fast as float, and also will not handle some non-volume-enclosing inputs as well as Float, so it is likely that the Float solver will always remain. We may eventually retire the old Exact Solver, however. This commit also prepares for more sensible code in the future by changing the internal enum names for the solvers to better reflect the algorithms used: Fast -> Float, and Exact -> Mesh_Arr (which means "Mesh Arrangments, the name of the paper upon which the current exact solver is based). Co-authored-by: Howard Trickey <trickey@google.com> Co-authored-by: Hans Goudey <hans@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/119294
2024-03-14 20:49:57 +01:00
.solver = eBooleanModifierSolver_Mesh_Arr, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.flag = eBooleanModifierFlag_Object, \
.bm_flag = 0, \
}
#define _DNA_DEFAULT_BuildModifierData \
{ \
.start = 1.0f, \
.length = 100.0f, \
.flag = 0, \
.randomize = 0, \
.seed = 0, \
}
#define _DNA_DEFAULT_CastModifierData \
{ \
.object = NULL, \
.fac = 0.5f, \
.radius = 0.0f, \
.size = 0.0f, \
.defgrp_name = "", \
.flag = MOD_CAST_X | MOD_CAST_Y | MOD_CAST_Z | MOD_CAST_SIZE_FROM_RADIUS, \
.type = MOD_CAST_TYPE_SPHERE, \
}
Cleanup: Use DNA defaults for cloth modifier Followup for rB8398050695 This requires moving a few enum definitions to DNA instead of BKE, and adding default definitions for the two structs the cloth modifier where the cloth modifier stores its settings. The defaults are also reordered to be consistent with the order of each item in the struct.
2020-10-01 19:56:34 +02:00
#define _DNA_DEFAULT_ClothSimSettings \
{ \
.cache = NULL, \
.mingoal = 0.0f, \
.Cvi = 1.0f, \
.gravity = {0.0f, 0.0f, -9.81f}, \
.dt = 0.0f, \
.mass = 0.3f, \
.shear = 5.0f, \
.bending = 0.5f, \
.max_bend = 0.5f, \
.max_shear = 5.0f, \
.max_sewing = 0.0f, \
.avg_spring_len = 0.0f, \
.timescale = 1.0f, \
.time_scale = 1.0f, \
.maxgoal = 1.0f, \
.eff_force_scale = 1000.0f, \
.eff_wind_scale = 250.0f, \
.sim_time_old = 0.0f, \
.defgoal = 0.0f, \
.goalspring = 1.0f, \
.goalfrict = 0.0f, \
.velocity_smooth = 0.0f, \
.density_target = 0.0f, \
.density_strength = 0.0f, \
.collider_friction = 0.0f, \
.shrink_min = 0.0f, \
.shrink_max = 0.0f, \
.uniform_pressure_force = 0.0f, \
.target_volume = 0.0f, \
.pressure_factor = 1.0f, \
.fluid_density = 0.0f, \
.vgroup_pressure = 0, \
.bending_damping = 0.5f, \
.voxel_cell_size = 0.1f, \
.stepsPerFrame = 5, \
.flags = CLOTH_SIMSETTINGS_FLAG_INTERNAL_SPRINGS_NORMAL, \
.maxspringlen = 10, \
.solver_type = 0, \
.vgroup_bend = 0, \
.vgroup_mass = 0, \
.vgroup_struct = 0, \
.vgroup_shrink = 0, \
.shapekey_rest = 0, \
.presets = 2, \
.reset = 0, \
.effector_weights = NULL, \
.bending_model = CLOTH_BENDING_ANGULAR, \
.vgroup_shear = 0, \
.tension = 15.0f , \
.compression = 15.0f, \
.max_tension = 15.0f, \
.max_compression = 15.0f, \
.tension_damp = 5.0f, \
.compression_damp = 5.0f, \
.shear_damp = 5.0f, \
.internal_spring_max_length = 0.0f, \
Cleanup: use M_PI_2 and M_PI_4 where possible The constant M_PI_4 is added to GLSL to ensure it works there too. Differential Revision: https://developer.blender.org/D14288
2022-03-11 16:14:05 +01:00
.internal_spring_max_diversion = M_PI_4, \
Cleanup: Use DNA defaults for cloth modifier Followup for rB8398050695 This requires moving a few enum definitions to DNA instead of BKE, and adding default definitions for the two structs the cloth modifier where the cloth modifier stores its settings. The defaults are also reordered to be consistent with the order of each item in the struct.
2020-10-01 19:56:34 +02:00
.vgroup_intern = 0, \
.internal_tension = 15.0f, \
.internal_compression = 15.0f, \
.max_internal_tension = 15.0f, \
.max_internal_compression = 15.0f, \
}
#define _DNA_DEFAULT_ClothCollSettings \
{ \
.collision_list = NULL, \
.epsilon = 0.015f, \
.self_friction = 5.0f, \
.friction = 5.0f, \
.damping = 0.0f, \
.selfepsilon = 0.015f, \
.flags = CLOTH_COLLSETTINGS_FLAG_ENABLED, \
.loop_count = 2, \
.group = NULL, \
.vgroup_selfcol = 0, \
Cloth: add a vertex group setting to exclude from object collision. This can be useful as a workaround on the boundary with the pinned vertices in some situations among other things, and completely copies the existing design of the self collision vertex group setting. Differential Revision: https://developer.blender.org/D10043
2021-01-08 11:02:40 +01:00
.vgroup_objcol = 0, \
Cleanup: Use DNA defaults for cloth modifier Followup for rB8398050695 This requires moving a few enum definitions to DNA instead of BKE, and adding default definitions for the two structs the cloth modifier where the cloth modifier stores its settings. The defaults are also reordered to be consistent with the order of each item in the struct.
2020-10-01 19:56:34 +02:00
.clamp = 0.0f, \
.self_clamp = 0.0f, \
}
#define _DNA_DEFAULT_ClothModifierData \
{ \
.clothObject = NULL, \
.sim_parms = NULL, \
.coll_parms = NULL, \
.point_cache = NULL, \
.ptcaches = {NULL, NULL}, \
.hairdata = NULL, \
.hair_grid_min = {0.0f, 0.0f, 0.0f}, \
.hair_grid_max = {0.0f, 0.0f, 0.0f}, \
.hair_grid_res = {0, 0, 0}, \
.hair_grid_cellsize = 0.0f, \
.solver_result = NULL, \
}
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
#define _DNA_DEFAULT_CollisionModifierData \
{ \
.x = NULL, \
.xnew = NULL, \
.xold = NULL, \
.current_xnew = NULL, \
.current_x = NULL, \
.current_v = NULL, \
Cleanup: Replace MVertTri type with C++ vector Similar to 7c69c8827b6552950717. Remove more unused includes.
2023-12-21 02:45:15 +01:00
.vert_tris = NULL, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.mvert_num = 0, \
.tri_num = 0, \
.time_x = -1000.0f, \
.time_xnew = -1000.0f, \
.is_static = false, \
.bvhtree = NULL, \
}
#define _DNA_DEFAULT_CorrectiveSmoothModifierData \
{ \
.bind_coords = NULL, \
.bind_coords_num = 0, \
.lambda = 0.5f, \
.scale = 1.0f, \
.repeat = 5, \
.flag = 0, \
.smooth_type = MOD_CORRECTIVESMOOTH_SMOOTH_SIMPLE, \
.defgrp_name = "", \
}
#define _DNA_DEFAULT_CurveModifierData \
{ \
.object = NULL, \
.name = "", \
.defaxis = MOD_CURVE_POSX, \
.flag = 0, \
}
UI: Fix Typos in Comments and Docs Approximately 91 spelling corrections, almost all in comments. Differential Revision: https://developer.blender.org/D10288 Reviewed by Harley Acheson
2021-02-06 04:07:03 +01:00
/* Defines are scattered across too many files, they need to be moved to DNA. */
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
#if 0
#define _DNA_DEFAULT_DataTransferModifierData \
{ \
.ob_source = NULL, \
.data_types = 0, \
.vmap_mode = MREMAP_MODE_VERT_NEAREST, \
.emap_mode = MREMAP_MODE_EDGE_NEAREST, \
.lmap_mode = MREMAP_MODE_LOOP_NEAREST_POLYNOR, \
.pmap_mode = MREMAP_MODE_POLY_NEAREST, \
.map_max_distance = 1.0f, \
.map_ray_radius = 0.0f, \
.islands_precision = 0.0f, \
.layers_select_src = {DT_LAYERS_ALL_SRC, DT_LAYERS_ALL_SRC, DT_LAYERS_ALL_SRC, DT_LAYERS_ALL_SRC}, \
.layers_select_dst = {DT_LAYERS_NAME_DST, DT_LAYERS_NAME_DST, DT_LAYERS_NAME_DST, DT_LAYERS_NAME_DST}, \
.mix_mod = CDT_MIX_TRANSFER, \
.mix_factor = 1.0f, \
.defgrp_name = "", \
.flags = MOD_DATATRANSFER_OBSRC_TRANSFORM, \
}
#endif
#define _DNA_DEFAULT_DecimateModifierData \
{ \
.percent = 1.0f, \
.iter = 0, \
.delimit = 0, \
.symmetry_axis = 0, \
.angle = DEG2RADF(5.0f), \
.defgrp_name = "", \
.defgrp_factor = 1.0f, \
.flag = 0, \
.mode = 0, \
.face_count = 0, \
}
#define _DNA_DEFAULT_DisplaceModifierData \
{ \
.texture = NULL, \
.map_object = NULL, \
.map_bone = "", \
.uvlayer_name = "", \
.uvlayer_tmp = 0, \
.texmapping = 0, \
.strength = 1.0f, \
.direction = MOD_DISP_DIR_NOR, \
.defgrp_name = "", \
.midlevel = 0.5f, \
.space = MOD_DISP_SPACE_LOCAL, \
.flag = 0, \
}
#define _DNA_DEFAULT_DynamicPaintModifierData \
{ \
.canvas = NULL, \
.brush = NULL, \
.type = MOD_DYNAMICPAINT_TYPE_CANVAS, \
}
/* Default to 30-degree split angle, sharpness from both angle & flag. */
#define _DNA_DEFAULT_EdgeSplitModifierData \
{ \
.split_angle = DEG2RADF(30.0f), \
.flags = MOD_EDGESPLIT_FROMANGLE | MOD_EDGESPLIT_FROMFLAG, \
}
#define _DNA_DEFAULT_ExplodeModifierData \
{ \
.facepa = NULL, \
.flag = eExplodeFlag_Unborn | eExplodeFlag_Alive | eExplodeFlag_Dead, \
.vgroup = 0, \
.protect = 0.0f, \
.uvname = "", \
}
/* Fluid modifier settings skipped for now. */
#define _DNA_DEFAULT_HookModifierData \
{ \
.subtarget = "", \
.flag = 0, \
.falloff_type = eHook_Falloff_Smooth, \
.parentinv = _DNA_DEFAULT_UNIT_M4, \
.cent = {0.0f, 0.0f, 0.0f}, \
.falloff = 0.0f, \
.curfalloff = NULL, \
.indexar = NULL, \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.indexar_num = 0, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.force = 1.0f, \
.name = "", \
}
#define _DNA_DEFAULT_LaplacianDeformModifierData \
{ \
.anchor_grp_name = "", \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.verts_num = 0, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.repeat = 1, \
.vertexco = NULL, \
.cache_system = NULL, \
.flag = 0, \
}
#define _DNA_DEFAULT_LaplacianSmoothModifierData \
{ \
.lambda = 0.01f, \
.lambda_border = 0.01f, \
.defgrp_name = "", \
.flag = MOD_LAPLACIANSMOOTH_X | MOD_LAPLACIANSMOOTH_Y | MOD_LAPLACIANSMOOTH_Z | \
MOD_LAPLACIANSMOOTH_PRESERVE_VOLUME | MOD_LAPLACIANSMOOTH_NORMALIZED, \
.repeat = 1, \
}
#define _DNA_DEFAULT_LatticeModifierData \
{ \
.object = NULL, \
.name = "", \
.strength = 1.0f, \
.flag = 0, \
}
#define _DNA_DEFAULT_MaskModifierData \
{ \
.ob_arm = NULL, \
.vgroup = "", \
.mode = 0, \
.flag = 0, \
.threshold = 0.0f, \
}
/* Y and Z forward and up axes, Blender default. */
#define _DNA_DEFAULT_MeshCacheModifierData \
{ \
.flag = 0, \
.type = MOD_MESHCACHE_TYPE_MDD, \
.time_mode = 0, \
.play_mode = 0, \
.forward_axis = 1, \
.up_axis = 2, \
.flip_axis = 0, \
.interp = MOD_MESHCACHE_INTERP_LINEAR, \
.factor = 1.0f, \
.deform_mode = 0.0f, \
.frame_start = 0.0f, \
.frame_scale = 1.0f, \
.eval_frame = 0.0f, \
.eval_time = 0.0f, \
.eval_factor = 0.0f, \
.filepath = "", \
}
#define _DNA_DEFAULT_MeshDeformModifierData \
{ \
.object = 0, \
.defgrp_name = "", \
.gridsize = 5, \
.flag = 0, \
.bindinfluences = NULL, \
.bindoffsets = NULL, \
.bindcagecos = NULL, \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.verts_num = 0, \
.cage_verts_num = 0, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.dyngrid = NULL, \
.dyninfluences = NULL, \
.dynverts = NULL, \
.dyngridsize = 0, \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.influences_num = 0, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.dyncellmin = {0.0f, 0.0f, 0.0f}, \
.dyncellwidth = 0.0f, \
.bindmat = _DNA_DEFAULT_UNIT_M4, \
.bindweights = NULL, \
.bindcos = NULL, \
.bindfunc = NULL, \
}
#define _DNA_DEFAULT_MeshSeqCacheModifierData \
{ \
.cache_file = NULL, \
.object_path = "", \
Fix T86654: wrong Vertex Interpolation option default when importing alembic caches This resulted in bad motion blur from alembic animation when imported after rB83980506957c (because it was now OFF by default). When imported in a version prior to rB83980506957c and saved, this was still working fine. Vertex interpolation option introduced in rBbab2260b59c7 was defaulting to ON (correct) in that commit, but was lost in rB83980506957c. Now switch this to ON by default again. Note: if you have a file that was (incorrectly) imported with a version after rB83980506957c you'll have to enable Vertex Interpolation option on every MeshSequenceCache modifier by hand. Maniphest Tasks: T86654 Differential Revision: https://developer.blender.org/D10876
2021-04-01 16:34:43 +02:00
.read_flag = MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | \
MOD_MESHSEQ_READ_COLOR | MOD_MESHSEQ_INTERPOLATE_VERTICES, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.velocity_scale = 1.0f, \
.reader = NULL, \
.reader_object_path = "", \
}
#define _DNA_DEFAULT_MirrorModifierData \
{ \
.flag = MOD_MIR_AXIS_X | MOD_MIR_VGROUP, \
.tolerance = 0.001f, \
Fix T85051: Add bisect distance as a parameter to the mirror modifier The `bisect_distance` in the mirror modifier was hard-coded to `0.001`. This would result in some unexpected behavior like vertices close to the mirror plane being deleted or merged. The fix now adds a parameter to the mirror modifier to expose the bisect distance to the user. The default is set to the previous hard-coded value to not "change" previous files. Ref D10201
2021-04-22 07:25:41 +02:00
.bisect_threshold = 0.001f, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.uv_offset = {0.0f, 0.0f}, \
.uv_offset_copy = {0.0f, 0.0f}, \
.mirror_ob = NULL, \
Fix T91444: Edge Loop Preview fails with two Mirror Modifiers The mirror modifiers merge option caused unnecessary re-ordering to the vertex array with original vertices merging into their copies. While this wasn't an error, it meant creating a 1:1 mapping from input vertices to their final output wasn't reliable (when looping over vertices first to last) as is done in BKE_editmesh_vert_coords_when_deformed. As merging in either direction is supported, keep the source meshes vertices in-order since it allows the vertex coordinates to be extracted. NOTE: Since this change introduce issues for some cases (e.g. bound modifiers like SurfaceDeform), this change is only applied to newly created modifiers, existing ones will still use the old incorrect merge behavior. Reviewed By: @brecht Maniphest Tasks: T93321, T91444 Differential Revision: https://developer.blender.org/D13355
2021-11-12 08:07:07 +01:00
.use_correct_order_on_merge = true, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
}
#define _DNA_DEFAULT_MultiresModifierData \
{ \
.lvl = 0, \
.sculptlvl = 0, \
.renderlvl = 0, \
.totlvl = 0, \
.flags = eMultiresModifierFlag_UseCrease | eMultiresModifierFlag_ControlEdges, \
Subdiv: Use better default UV interpolation The default one is now UVs are smoothed, boundaries are kept sharp. After some time of experimentation seems this is better default from interoperability point of view. This fixes distortion reported in T83470. Differential Revision: https://developer.blender.org/D10111
2021-01-13 16:58:36 +01:00
.uv_smooth = SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.quality = 4, \
.boundary_smooth = SUBSURF_BOUNDARY_SMOOTH_ALL, \
}
#define _DNA_DEFAULT_NormalEditModifierData \
{ \
.defgrp_name = "", \
.target = NULL, \
.mode = MOD_NORMALEDIT_MODE_RADIAL, \
.flag = 0, \
.mix_mode = MOD_NORMALEDIT_MIX_COPY, \
.mix_factor = 1.0f, \
.mix_limit = M_PI, \
.offset = {0.0f, 0.0f, 0.0f}, \
}
Cleanup: use snake case, especially for structs that define callbacks Use snake case for ShaderFxTypeInfo, ModifierTypeInfo, GpencilModifierTypeInfo & bConstraintTypeInfo.
2023-07-27 04:04:18 +02:00
/* Some fields are initialized in #init_data. */
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
#define _DNA_DEFAULT_OceanModifierData \
{ \
.ocean = NULL, \
.oceancache = NULL, \
.resolution = 7, \
.viewport_resolution = 7, \
.spatial_size = 50, \
.wind_velocity = 30.0f, \
.damp = 0.5f, \
.smallest_wave = 0.01f, \
.depth = 200.0f, \
.wave_alignment = 0.0f, \
.wave_direction = 0.0f, \
.wave_scale = 1.0f, \
.chop_amount = 1.0f, \
.foam_coverage = 0.0f, \
.time = 1.0f, \
.spectrum = MOD_OCEAN_SPECTRUM_PHILLIPS, \
.fetch_jonswap = 120.0f, \
.sharpen_peak_jonswap = 0.0f, \
.bakestart = 1, \
.bakeend = 250, \
.cachepath = "", \
.foamlayername = "", \
.spraylayername = "", \
.cached = 0, \
.geometry_mode = 0, \
.flag = 0, \
.repeat_x = 1, \
.repeat_y = 1, \
.seed = 0, \
.size = 1.0f, \
.foam_fade = 0.98f, \
}
#define _DNA_DEFAULT_ParticleInstanceModifierData \
{ \
.psys = 1, \
.flag = eParticleInstanceFlag_Parents | eParticleInstanceFlag_Unborn | \
eParticleInstanceFlag_Alive | eParticleInstanceFlag_Dead, \
.axis = 2, \
.space = eParticleInstanceSpace_World, \
.position = 1.0f, \
.random_position = 0.0f, \
.rotation = 0.0f, \
.random_rotation = 0.0f, \
Fix T83886: Particle instance modifier broken Caused by Caused by rB83980506957c. Since above commit, the modifier was created with wrong initial values [amount was 0.0 and offset was 1.0 -- instead of the other way around]. Since there is no way to fix existing files in a reasonable way I guess, all we can do here is to make sure that from now on, the defaults are correct. Maniphest Tasks: T83886 Differential Revision: https://developer.blender.org/D9881
2020-12-17 12:38:40 +01:00
.particle_offset = 0.0f, \
.particle_amount = 1.0f, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.index_layer_name = "", \
.value_layer_name = "", \
}
#define _DNA_DEFAULT_ParticleSystemModifierData \
{ \
.psys = NULL, \
.mesh_final = NULL, \
.mesh_original = NULL, \
.totdmvert = 0, \
.totdmedge = 0, \
.totdmface = 0, \
.flag = 0, \
}
#define _DNA_DEFAULT_RemeshModifierData \
{ \
.threshold = 1.0f, \
.scale = 0.9f, \
.hermite_num = 1.0f, \
.depth = 4, \
.flag = MOD_REMESH_FLOOD_FILL, \
.mode = MOD_REMESH_VOXEL, \
.voxel_size = 0.1f, \
.adaptivity = 0.0f, \
}
#define _DNA_DEFAULT_ScrewModifierData \
{ \
.ob_axis = NULL, \
.steps = 16, \
.render_steps = 16, \
.iter = 1, \
.screw_ofs = 0.0f, \
.angle = 2.0f * M_PI, \
.merge_dist = 0.01f, \
.flag = MOD_SCREW_SMOOTH_SHADING, \
.axis = 2, \
}
/* Shape key modifier has no items. */
#define _DNA_DEFAULT_ShrinkwrapModifierData \
{ \
.target = NULL, \
.auxTarget = NULL, \
.vgroup_name = "", \
.keepDist = 0.0f, \
.shrinkType = MOD_SHRINKWRAP_NEAREST_SURFACE, \
.shrinkOpts = MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR, \
.shrinkMode = 0, \
.projLimit = 0.0f, \
.projAxis = 0, \
.subsurfLevels = 0, \
}
#define _DNA_DEFAULT_SimpleDeformModifierData \
{ \
.origin = NULL, \
.vgroup_name = "", \
.factor = DEG2RADF(45.0f), \
.limit = {0.0f, 1.0f}, \
.mode = MOD_SIMPLEDEFORM_MODE_TWIST, \
.axis = 0, \
.deform_axis = 0, \
.flag = 0, \
}
Geometry Nodes: initial scattering and geometry nodes This is the initial merge from the geometry-nodes branch. Nodes: * Attribute Math * Boolean * Edge Split * Float Compare * Object Info * Point Distribute * Point Instance * Random Attribute * Random Float * Subdivision Surface * Transform * Triangulate It includes the initial evaluation of geometry node groups in the Geometry Nodes modifier. Notes on the Generic attribute access API The API adds an indirection for attribute access. That has the following benefits: * Most code does not have to care about how an attribute is stored internally. This is mainly necessary, because we have to deal with "legacy" attributes such as vertex weights and attributes that are embedded into other structs such as vertex positions. * When reading from an attribute, we generally don't care what domain the attribute is stored on. So we want to abstract away the interpolation that that adapts attributes from one domain to another domain (this is not actually implemented yet). Other possible improvements for later iterations include: * Actually implement interpolation between domains. * Don't use inheritance for the different attribute types. A single class for read access and one for write access might be enough, because we know all the ways in which attributes are stored internally. We don't want more different internal structures in the future. On the contrary, ideally we can consolidate the different storage formats in the future to reduce the need for this indirection. * Remove the need for heap allocations when creating attribute accessors. It includes commits from: * Dalai Felinto * Hans Goudey * Jacques Lucke * Léo Depoix
2020-12-02 13:25:25 +01:00
#define _DNA_DEFAULT_NodesModifierData \
Fix compile error Haven't tested on windows, hope that works.
2020-10-20 14:16:29 +02:00
{ 0 }
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
#define _DNA_DEFAULT_SkinModifierData \
{ \
.branch_smoothing = 0.0f, \
.flag = 0, \
.symmetry_axes = MOD_SKIN_SYMM_X, \
}
#define _DNA_DEFAULT_SmoothModifierData \
{ \
.fac = 0.5f, \
.repeat = 1, \
.defgrp_name = "", \
.flag = MOD_SMOOTH_X | MOD_SMOOTH_Y | MOD_SMOOTH_Z, \
}
/* Softbody modifier skipped for now. */
#define _DNA_DEFAULT_SolidifyModifierData \
{ \
.defgrp_name = "", \
.shell_defgrp_name = "", \
.rim_defgrp_name = "", \
.offset = 0.01f, \
.offset_fac = -1.0f, \
.offset_fac_vg = 0.0f, \
.offset_clamp = 0.0f, \
.mode = MOD_SOLIDIFY_MODE_EXTRUDE, \
.nonmanifold_offset_mode = MOD_SOLIDIFY_NONMANIFOLD_OFFSET_MODE_CONSTRAINTS, \
.nonmanifold_boundary_mode = MOD_SOLIDIFY_NONMANIFOLD_BOUNDARY_MODE_NONE, \
.crease_inner = 0.0f, \
.crease_outer = 0.0f, \
.crease_rim = 0.0f, \
.flag = MOD_SOLIDIFY_RIM, \
.mat_ofs = 0, \
.mat_ofs_rim = 0, \
.merge_tolerance = 0.0001f, \
.bevel_convex = 0.0f, \
}
#define _DNA_DEFAULT_SubsurfModifierData \
{ \
.subdivType = 0, \
.levels = 1, \
.renderLevels = 2, \
.flags = eSubsurfModifierFlag_UseCrease | eSubsurfModifierFlag_ControlEdges, \
Subdiv: Use better default UV interpolation The default one is now UVs are smoothed, boundaries are kept sharp. After some time of experimentation seems this is better default from interoperability point of view. This fixes distortion reported in T83470. Differential Revision: https://developer.blender.org/D10111
2021-01-13 16:58:36 +01:00
.uv_smooth = SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.quality = 3, \
.boundary_smooth = SUBSURF_BOUNDARY_SMOOTH_ALL, \
.emCache = NULL, \
.mCache = NULL, \
}
#define _DNA_DEFAULT_SurfaceModifierData \
{ \
Fix building on MSVC Empty struct introduced in dad9f45561a1cd129d86cbdd93b883dcaef0df26.
2023-01-10 09:04:07 +01:00
.runtime = {NULL}, /* Include to avoid empty an struct (for MSVC). */ \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
}
#define _DNA_DEFAULT_SurfaceDeformModifierData \
{ \
.depsgraph = NULL, \
.target = NULL, \
.verts = NULL, \
.falloff = 4.0f, \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.mesh_verts_num = 0, \
.bind_verts_num = 0, \
Allow surface deform when target mesh increases number of vertices A studio request actually. The goal is to cover rather typical situation: when the mesh was bound to target when the target was on subdivision level 0 but uses a higher subdivision level for rendering. Example of such setup is a facial hair bound to the face. The idea of this change is to use first N vertices from the target where N is the number of vertices on target during binding process. While this sounds a bit arbitrary it covers typical modifier setup used for rigging. Arguably, it is not more arbitrary than using a number of polygons (which is how the modifier was checking for changes on target before this change). Quite straightforward change. A bit tricky part was to not break the behavior since before this change we did not track number of vertices sued when binding. The naming I'm also not super happy with and just followed the existing one. Ideally the variables in DNA will be prefixed with `target_` but doing it for an existing field would mean compatibility change, and only using prefix for the new field will introduce weird semantic where the polygons count will be even more easily confused with a count on the deforming mesh. Differential Revision: https://developer.blender.org/D14830
2022-05-03 15:30:21 +02:00
.target_verts_num = 0, \
Cleanup: More clear name in surface deform modifier Make it explicit that counter is about target mesh. Use DNA rename for it so that the files stay compatible. Also renamed some purely runtime fields to replace `t` prefix with `target` as the short `t` is super easy to miss. Differential Revision: https://developer.blender.org/D14835
2022-05-03 17:19:53 +02:00
.target_polys_num = 0, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.flags = 0, \
.mat = _DNA_DEFAULT_UNIT_M4, \
.strength = 1.0f, \
.defgrp_name = "", \
}
#define _DNA_DEFAULT_TriangulateModifierData \
{ \
.flag = 0, \
.quad_method = MOD_TRIANGULATE_QUAD_SHORTEDGE, \
.ngon_method = MOD_TRIANGULATE_NGON_BEAUTY, \
.min_vertices = 4, \
}
#define _DNA_DEFAULT_UVProjectModifierData \
{ \
.projectors = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, \
Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members.
2022-03-28 03:29:47 +02:00
.projectors_num = 1, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.aspectx = 1.0f, \
.aspecty = 1.0f, \
.scalex = 1.0f, \
.scaley = 1.0f, \
.uvlayer_name = "", \
.uvlayer_tmp = 0, \
}
#define _DNA_DEFAULT_UVWarpModifierData \
{ \
.axis_u = 0, \
.axis_v = 1, \
.flag = 0, \
.center = {0.5f, 0.5f}, \
.offset = {0.0f, 0.0f}, \
.scale = {1.0f, 1.0f}, \
.rotation = 0.0f, \
.object_src = NULL, \
.bone_src = "", \
.object_dst = NULL, \
.bone_dst = "", \
.vgroup_name = "", \
.uvlayer_name = "", \
}
#define _DNA_DEFAULT_WarpModifierData \
{ \
.texture = NULL, \
.map_object = NULL, \
.map_bone = "", \
.uvlayer_name = "", \
.uvlayer_tmp = 0, \
.texmapping = 0, \
.object_from = NULL, \
.object_to = NULL, \
.bone_from = "", \
.bone_to = "", \
.curfalloff = NULL, \
.defgrp_name = "", \
.strength = 1.0f, \
.falloff_radius = 1.0f, \
.flag = 0, \
.falloff_type = eWarp_Falloff_Smooth, \
}
#define _DNA_DEFAULT_WaveModifierData \
{ \
.texture = NULL, \
.map_object = NULL, \
.map_bone = "", \
.uvlayer_name = "", \
.uvlayer_tmp = 0, \
.texmapping = MOD_DISP_MAP_LOCAL, \
.objectcenter = NULL, \
.defgrp_name = "", \
.flag = MOD_WAVE_X | MOD_WAVE_Y | MOD_WAVE_CYCL | MOD_WAVE_NORM_X | MOD_WAVE_NORM_Y | MOD_WAVE_NORM_Z, \
.startx = 0.0f, \
.starty = 0.0f, \
.height = 0.5f, \
.width = 1.5f, \
.narrow = 1.5f, \
.speed = 0.25f, \
.damp = 10.0f, \
.falloff = 0.0f, \
.timeoffs = 0.0f, \
.lifetime = 0.0f, \
}
#define _DNA_DEFAULT_WeightedNormalModifierData \
{ \
.defgrp_name = "", \
.mode = MOD_WEIGHTEDNORMAL_MODE_FACE, \
.flag = 0, \
.weight = 50, \
.thresh = 0.01f, \
}
#define _DNA_DEFAULT_WeightVGEditModifierData \
{ \
.defgrp_name = "", \
.edit_flags = 0, \
.falloff_type = MOD_WVG_MAPPING_NONE, \
.default_weight = 0.0f, \
.cmap_curve = NULL, \
.add_threshold = 0.01f, \
.rem_threshold = 0.01f, \
.mask_constant = 1.0f, \
.mask_defgrp_name = "", \
.mask_tex_use_channel = MOD_WVG_MASK_TEX_USE_INT, \
.mask_texture = NULL, \
.mask_tex_map_obj = NULL, \
.mask_tex_map_bone = "", \
.mask_tex_mapping = MOD_DISP_MAP_LOCAL, \
.mask_tex_uvlayer_name = "", \
}
#define _DNA_DEFAULT_WeightVGMixModifierData \
{ \
.defgrp_name_a = "", \
.defgrp_name_b = "", \
.default_weight_a = 0.0f, \
.default_weight_b = 0.0f, \
.mix_mode = MOD_WVG_MIX_SET, \
.mix_set = MOD_WVG_SET_AND, \
.mask_constant = 1.0f, \
.mask_defgrp_name = "", \
.mask_tex_use_channel = MOD_WVG_MASK_TEX_USE_INT, \
.mask_texture = NULL, \
.mask_tex_map_obj = NULL, \
.mask_tex_map_bone = "", \
.mask_tex_mapping = MOD_DISP_MAP_LOCAL, \
.mask_tex_uvlayer_name = "", \
.flag = 0, \
}
#define _DNA_DEFAULT_WeightVGProximityModifierData \
{ \
.defgrp_name = "", \
.proximity_mode = MOD_WVG_PROXIMITY_OBJECT, \
.proximity_flags = MOD_WVG_PROXIMITY_GEOM_VERTS, \
.proximity_ob_target = NULL, \
.mask_constant = 1.0f, \
.mask_defgrp_name = "", \
.mask_tex_use_channel = MOD_WVG_MASK_TEX_USE_INT, \
.mask_texture = NULL, \
.mask_tex_map_obj = NULL, \
.mask_tex_map_bone = "", \
.mask_tex_mapping = MOD_DISP_MAP_LOCAL, \
.mask_tex_uvlayer_name = "", \
.min_dist = 0.0f, \
.max_dist = 1.0f, \
.falloff_type = MOD_WVG_MAPPING_NONE, \
}
#define _DNA_DEFAULT_WeldModifierData \
{ \
.merge_dist = 0.001f, \
Cleanup: use common 'MOD_WELD_MODE_' prefix
2020-12-09 04:10:30 +01:00
.mode = MOD_WELD_MODE_ALL, \
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
.defgrp_name = "", \
}
#define _DNA_DEFAULT_WireframeModifierData \
{ \
.defgrp_name = "", \
.offset = 0.02f, \
.offset_fac = 0.0f, \
.offset_fac_vg = 0.0f, \
.crease_weight = 1.0f, \
.flag = MOD_WIREFRAME_REPLACE | MOD_WIREFRAME_OFS_EVEN, \
.mat_ofs = 0, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Opacity modifier Opacity modifier implementation based on GP2. Functionality is largely unchanged. _Color Mode_ is either `Stroke` or `Fill` for modifying color opacity or `Hardness`. _Uniform Opacity_ does two things at once (!): - Sets the same opacity value for every point in a stroke. - Sets opacity as an absolute value rather than a factor. _Weight as Factor_ (button to the right of Opacity Factor): Use the vertex group as opacity __factor__ rather than an overall __influence__. This is confusing and hard to convey, but copies behavior from GP2. The _Influence_ panel contains the same filter settings as the GP2 modifier, with some small changes: - _Layer_ selects only strokes in the respective layer (with an _Invert_ option) - _Material_ selects only points with the respective material (with an _Invert_ option) - _Layer Pass_ and _Material Pass_ select only strokes/points which are rendered in the respective pass. _Note 1: Layers don't have UI for setting a pass yet, this will be a generic layer attribute. This can be set through the API for testing._ _Note 2: In GP2 a pass value of zero was used to disable pass filters. Since zero is a valid pass ID an explicit flag has been added for the purpose of turning pass filters on and off._ - _Vertex Group_: This can be used as an additional influence filter on points. If _Weight as Factor_ is enable the vertex group instead replaces the opacity factor. In _Fill_ mode the vertex group weight of the stroke's first point is used as influence for the entire stroke. - _Custom Curve_ is another possible influence factor per point. The curve input value is the relative position of a point along its stroke. The Influence settings have been moved into a separate DNA struct, which should help with reusability in various modifiers. Various utility functions can be found int `MOD_grease_pencil_util.hh` for handling influence settings and generating `IndexMasks` for modernized C++ code. Pull Request: https://projects.blender.org/blender/blender/pulls/116946
2024-01-16 16:56:14 +01:00
#define _DNA_DEFAULT_GreasePencilOpacityModifierData \
{ \
.color_mode = MOD_GREASE_PENCIL_COLOR_BOTH, \
.color_factor = 1.0f, \
.hardness_factor = 1.0f, \
}
GPv3: Subdivide Modifier This ports the Subdivide modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117056
2024-01-18 13:02:53 +01:00
#define _DNA_DEFAULT_GreasePencilSubdivModifierData \
{ \
.level = 1, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Tint and Color modifiers Implements the Tint and Color (aka. "Hue/Saturation") modifiers. Pull Request: https://projects.blender.org/blender/blender/pulls/117297
2024-01-19 16:59:39 +01:00
#define _DNA_DEFAULT_GreasePencilColorModifierData \
{ \
.color_mode = MOD_GREASE_PENCIL_COLOR_BOTH, \
.hsv = {0.5f, 1.0f, 1.0f}, \
}
#define _DNA_DEFAULT_GreasePencilTintModifierData \
{ \
.color_mode = MOD_GREASE_PENCIL_COLOR_BOTH, \
.tint_mode = MOD_GREASE_PENCIL_TINT_UNIFORM, \
.factor = 0.5f, \
.radius = 1.0f, \
.color = {1.0f, 1.0f, 1.0f}, \
}
GPv3: Smooth modifier Smooth modifier ported to Grease Pencil 3.0 Exposed `smooth_curve_attribute()` from `grease_pencil_edit.cc` to achieve the smoothing effect. It will not be the exact same result as the old algorithm. Pull Request: https://projects.blender.org/blender/blender/pulls/116975
2024-01-24 04:36:36 +01:00
#define _DNA_DEFAULT_GreasePencilSmoothModifierData \
{ \
.flag = MOD_GREASE_PENCIL_SMOOTH_MOD_LOCATION, \
.factor = 1.0f, \
.step = 1, \
}
Cleanup: strip trailing space
2024-02-02 00:43:17 +01:00
GPv3: Offset modifier Ported the Offset modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117446
2024-01-24 16:57:58 +01:00
#define _DNA_DEFAULT_GreasePencilOffsetModifierData \
{ \
.flag = 0, \
.offset_mode = MOD_GREASE_PENCIL_OFFSET_RANDOM, \
.loc = {0.0f, 0.0f, 0.0f}, \
.rot = {0.0f, 0.0f, 0.0f}, \
Fix #118489: Use zero scale default since it's used as an offset.
2024-02-20 11:20:06 +01:00
.scale = {0.0f, 0.0f, 0.0f}, \
GPv3: Offset modifier Ported the Offset modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117446
2024-01-24 16:57:58 +01:00
.stroke_step = 1, \
.stroke_start_offset = 0, \
}
GPv3: Noise modifier This ports the noise modifier to GPv3. There should be no functional changes. Pull Request: https://projects.blender.org/blender/blender/pulls/117057
2024-01-29 16:49:16 +01:00
#define _DNA_DEFAULT_GreasePencilNoiseModifierData \
{ \
.flag = GP_NOISE_FULL_STROKE | GP_NOISE_USE_RANDOM, \
.factor = 0.5f, \
.factor_strength = 0.0f, \
.factor_thickness = 0.0f, \
.factor_uvs = 0.0f, \
.noise_scale = 0.0f, \
.noise_offset = 0.0f, \
.step = 4, \
.seed = 1, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Mirror modifier Implements the mirror modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117637
2024-01-30 12:10:33 +01:00
#define _DNA_DEFAULT_GreasePencilMirrorModifierData \
{ \
.flag = MOD_GREASE_PENCIL_MIRROR_AXIS_X, \
}
Cleanup: strip trailing space
2024-02-02 00:43:17 +01:00
GPv3: Thickness modifier Thickness modifier ported to Grease Pencil v3. Note: Uniform thickness range and UI step changed to better match new thickness of blender unit. ![image](/attachments/2e9c9bfa-d869-4bec-a529-c3833390a201) Pull Request: https://projects.blender.org/blender/blender/pulls/117631
2024-01-30 13:04:30 +01:00
#define _DNA_DEFAULT_GreasePencilThickModifierData \
{ \
.flag = 0, \
.thickness_fac = 1.0f, \
.thickness = 0.02, \
}
GPv3: Mirror modifier Implements the mirror modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117637
2024-01-30 12:10:33 +01:00
GPv3: Lattice modifier Ported lattice modifier from GPv2. The `LatticeDeformData` is no longer stored in the modifier data, but calculated on-the-fly like in the mesh deform modifier. This is quite trivial data and only stores deformed positions of the lattice, so not really worth the effort and complexity of caching it. Pull Request: https://projects.blender.org/blender/blender/pulls/117955
2024-02-08 14:09:11 +01:00
#define _DNA_DEFAULT_GreasePencilLatticeModifierData \
{ \
.object = NULL, \
.strength = 1.0f, \
}
GPv3: Dash modifier Reimplements the "Dash" (aka Dash-Dot) modifier of GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117758
2024-02-08 15:35:20 +01:00
#define _DNA_DEFAULT_GreasePencilDashModifierData \
{ \
.dash_offset = 0, \
.segments_array = NULL, \
.segments_num = 0, \
.segment_active_index = 0, \
}
#define _DNA_DEFAULT_GreasePencilDashModifierSegment \
{ \
Fix #118135: Make sure the new active index is always valid When deleting all the segments the active index is generally 0. Adding a new segment increments the active index, which pushes it out of range. The code should not expect active index to be inside the current range. Pull Request: https://projects.blender.org/blender/blender/pulls/118143
2024-02-12 16:44:28 +01:00
.name = "Segment", \
GPv3: Dash modifier Reimplements the "Dash" (aka Dash-Dot) modifier of GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/117758
2024-02-08 15:35:20 +01:00
.dash = 2, \
.gap = 1, \
.radius = 1.0f, \
.opacity = 1.0f, \
.mat_nr = -1, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Multiple Strokes Modifier This migrates the multiple strokes modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/117796
2024-02-15 14:19:50 +01:00
#define _DNA_DEFAULT_GreasePencilMultiModifierData \
{ \
.flag = 0, \
.duplications = 3, \
.distance = 0.1f, \
.offset = 0.0f, \
.fading_center = 0.5f, \
.fading_thickness = 0.5f, \
.fading_opacity = 0.5f, \
}
GPv3: Length modifier This ports the length modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/117124
2024-02-15 16:37:54 +01:00
#define _DNA_DEFAULT_GreasePencilLengthModifierData \
{ \
.start_fac = 0.1f,\
.end_fac = 0.1f,\
.overshoot_fac = 0.1f,\
.flag = GP_LENGTH_USE_CURVATURE,\
.point_density = 30.0f,\
.segment_influence = 0.0f,\
.max_angle = DEG2RAD(170.0f),\
.rand_start_fac = 0.0f,\
.rand_end_fac = 0.0f,\
.rand_offset = 0.0f,\
.seed = 0,\
.step = 4,\
}
GPv3: Vertex Weight Angle modifier This ports the Vertex Weight Angle modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/117846
2024-02-16 12:30:43 +01:00
#define _DNA_DEFAULT_GreasePencilWeightAngleModifierData \
{ \
.flag = 0, \
.axis = 1, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Array Modifier This migrates the Array modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/117836
2024-02-16 14:04:01 +01:00
#define _DNA_DEFAULT_GreasePencilArrayModifierData \
{ \
.object = NULL, \
.count = 2, \
.flag = GP_ARRAY_USE_RELATIVE, \
.offset = {0.0f, 0.0f, 0.0f}, \
.shift = {1.0f, 0.0f, 0.0f}, \
.rnd_offset = {0.0f, 0.0f, 0.0f}, \
.rnd_rot = {0.0f, 0.0f, 0.0f}, \
.rnd_scale = {0.0f, 0.0f, 0.0f}, \
.seed = 1, \
.mat_rpl = 0, \
}
GPv3: Hook modifier Migrates the Hook modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/118452
2024-02-21 14:20:47 +01:00
GPv3: Weight proximity modifier This migrates the Weight proximity modifier to GPv3. Pull Request: https://projects.blender.org/blender/blender/pulls/118363
2024-02-19 11:16:38 +01:00
#define _DNA_DEFAULT_GreasePencilWeightProximityModifierData \
{ \
.target_vgname = "", \
.flag = 0, \
.dist_start = 0.0f, \
.dist_end = 20.0f, \
}
Cleanup: Grammar in comments: Fix uses of "own" "Own" (the adjective) cannot be used on its own. It should be combined with something like "its own", "our own", "her own", or "the object's own". It also isn't used separately to mean something like "separate". Also, "its own" is correct instead of "it's own" which is a misues of the verb.
2024-03-07 22:20:36 +01:00
GPv3: Hook modifier Migrates the Hook modifier to Grease Pencil v3. Pull Request: https://projects.blender.org/blender/blender/pulls/118452
2024-02-21 14:20:47 +01:00
#define _DNA_DEFAULT_GreasePencilHookModifierData \
{ \
.object = NULL, \
.subtarget = "", \
.flag = 0, \
.falloff_type = MOD_GREASE_PENCIL_HOOK_Falloff_Smooth, \
.parentinv = _DNA_DEFAULT_UNIT_M4, \
.cent = {0.0f, 0.0f, 0.0f}, \
.falloff = 0.0f, \
.force = 0.5f, \
}
GPv3: Line Art Modifier This is a migration of the current Line Art modifier to GPv3. Note: - The modifier is using the exact same DNA structure as the old one, it's re-defined in a different name. At the moment all the variable names and placement after the `ModifierData` part should stay exactly the same until we do proper versioning of the modifier data and completely remove the GPv2 support. - Vertex weight transfer feature no longer supports name initial matching ("group" used to match "group1","group2" etc). Now it will only transfer vertex weight from source vertex groups that has the exact same name as specified. Pull Request: https://projects.blender.org/blender/blender/pulls/117028
2024-02-26 15:28:15 +01:00
#define _DNA_DEFAULT_GreasePencilLineartModifierData \
{ \
.edge_types = MOD_LINEART_EDGE_FLAG_INIT_TYPE, \
.thickness = 25, \
.opacity = 1.0f, \
.crease_threshold = DEG2RAD(140.0f), \
.calculation_flags = MOD_LINEART_ALLOW_DUPLI_OBJECTS | MOD_LINEART_ALLOW_CLIPPING_BOUNDARIES | \
MOD_LINEART_USE_CREASE_ON_SHARP_EDGES | MOD_LINEART_FILTER_FACE_MARK_KEEP_CONTOUR | \
MOD_LINEART_MATCH_OUTPUT_VGROUP, \
/* Do not split by default, this is for better chaining quality. */ \
.angle_splitting_threshold = 0.0f, \
.chaining_image_threshold = 0.001f, \
.stroke_depth_offset = 0.05,\
.chain_smooth_tolerance = 0.0f,\
.overscan = 0.1f,\
.shadow_camera_near = 0.1f, \
.shadow_camera_far = 200.0f, \
.shadow_camera_size = 200.0f, \
}
GPv3: Armature Modifier Armature deformation modifier for Grease Pencil v3. Changes compared to GPv2: - `multi` DNA field was unused and was removed. - `vert_coords_prev` array is unused and was removed (gets passed to armature functions but never gets allocated). - GPv3 modifier uses the common `influence` struct to store the vertex group name, for consistency. The `GREASE_PENCIL_INFLUENCE_INVERT_VERTEX_GROUP` flag is copied to `deformflag` as `ARM_DEF_INVERT_VGROUP` before evaluation, which is used internally by armature functions. - `BKE_armature_deform_coords_with_curves` is added as another variant of the deform function, but uses C++ parameter types (spans instead of raw pointers). It gets a `Span<MDeformVert>` directly instead of deducing it internally from the object type. This is because we want to do this curve-by-curve and already use arbitrary vector spans for positions. Pull Request: https://projects.blender.org/blender/blender/pulls/118752
2024-02-26 19:36:10 +01:00
#define _DNA_DEFAULT_GreasePencilArmatureModifierData \
{ \
.deformflag = ARM_DEF_VGROUP, \
.object = NULL, \
}
GPv3: Time offset modifier Port of the Time Offset modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/118371
2024-02-27 14:17:22 +01:00
#define _DNA_DEFAULT_GreasePencilTimeModifierData \
{ \
.flag = MOD_GREASE_PENCIL_TIME_KEEP_LOOP, \
.offset = 1, \
.frame_scale = 1.0f, \
.mode = 0, \
.sfra = 1, \
.efra = 250, \
.segments_array = NULL, \
.segments_num = 1, \
.segment_active_index = 0, \
}
#define _DNA_DEFAULT_GreasePencilTimeModifierSegment \
{ \
.name = "Segment", \
.segment_start = 1, \
.segment_end = 2, \
.segment_mode = 0, \
.segment_repeat = 1, \
}
GPv3: Envelope Modifier Ports the Envelope modifier from GPv2. Pull Request: https://projects.blender.org/blender/blender/pulls/118272
2024-03-01 10:42:41 +01:00
#define _DNA_DEFAULT_GreasePencilEnvelopeModifierData \
{ \
.spread = 10, \
.mode = MOD_GREASE_PENCIL_ENVELOPE_SEGMENTS, \
.mat_nr = -1, \
.thickness = 1.0f, \
.strength = 1.0f, \
.skip = 0, \
}
GPv3: Build Modifer migration Reimplemented build modifier using the new `CurvesGeometry` logic. Pull Request: https://projects.blender.org/blender/blender/pulls/118739
2024-03-20 13:28:28 +01:00
GPv3: Outline modifier Port of GPv2 outline modifier. Pull Request: https://projects.blender.org/blender/blender/pulls/118911
2024-03-04 16:54:07 +01:00
#define _DNA_DEFAULT_GreasePencilOutlineModifierData \
{ \
.flag = MOD_GREASE_PENCIL_OUTLINE_KEEP_SHAPE, \
.thickness = 1, \
.sample_length = 0.0f, \
.subdiv = 3, \
.outline_material = NULL, \
}
GPv3: Shrinkwrap modifier Port of shrinkwrap modifier from GPv2. Adds a new API function in `BKE_shrinkwrap.hh` for the modifier. Pull Request: https://projects.blender.org/blender/blender/pulls/119118
2024-03-06 12:05:00 +01:00
#define _DNA_DEFAULT_GreasePencilShrinkwrapModifierData \
{ \
.target = NULL, \
.aux_target = NULL, \
.keep_dist = 0.05f, \
.shrink_type = MOD_SHRINKWRAP_NEAREST_SURFACE, \
.shrink_opts = MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR, \
.shrink_mode = MOD_SHRINKWRAP_ON_SURFACE, \
.proj_limit = 0.0f, \
.proj_axis = MOD_SHRINKWRAP_PROJECT_OVER_NORMAL, \
.subsurf_levels = 0, \
.smooth_factor = 0.05f, \
.smooth_step = 1, \
}
GPv3: Build Modifer migration Reimplemented build modifier using the new `CurvesGeometry` logic. Pull Request: https://projects.blender.org/blender/blender/pulls/118739
2024-03-20 13:28:28 +01:00
/* Here we deliberately set effective range to the half the default
* frame-range to have an immediate effect to suggest use-cases. */
#define _DNA_DEFAULT_GreasePencilBuildModifierData \
{ \
.start_frame = 1, \
.end_frame = 125, \
.start_delay = 0.0f, \
.length = 100.0f, \
.flag = 0, \
.mode = 0, \
.transition = 0, \
.time_alignment = 0, \
.time_mode = 0, \
.speed_fac = 1.2f, \
.speed_maxgap = 0.5f, \
.percentage_fac = 0.0f, \
}
GPv3: Simplify Modifier Implements the GPv2 simplify modifier. Pull Request: https://projects.blender.org/blender/blender/pulls/120018
2024-03-28 18:16:14 +01:00
#define _DNA_DEFAULT_GreasePencilSimplifyModifierData \
{ \
.factor = 0.0f, \
.mode = MOD_GREASE_PENCIL_SIMPLIFY_FIXED, \
.step = 1, \
.length = 0.1f, \
.distance = 0.1f, \
}
GPv3: Texture offset modifier Port of the GPv2 texture modifier for transforming UVs of stroke points. Pull Request: https://projects.blender.org/blender/blender/pulls/119050
2024-03-29 21:42:30 +01:00
#define _DNA_DEFAULT_GreasePencilTextureModifierData \
{ \
.uv_offset = 0.0f, \
.uv_scale = 1.0f, \
.fill_rotation = 0.0f, \
.fill_offset = {0.0f, 0.0f}, \
.fill_scale = 1.0f, \
.fit_method = GP_TEX_CONSTANT_LENGTH, \
.mode = 0, \
}
Use DNA defaults system for modifiers As noted in T80164, there are quite a few area of Blender where the "Reset to Default Value" operator in button context menus doesn't work. Modifiers are one of them, because the DNA defaults system was never set up for them. Additionally, this should make modifier versioning easier. Whenever a new field is added it should be automatically initialized to the default value. I had to make some ordering changes in the following modifiers to work around an error with `-Wsign-conversion` in the macros: - Solidify Modifier - Corrective Smooth Modifier - Screw Modifier Some modifiers are special cases and are skipped in this commit: - Data Transfer Modifier - Cloth Modifier - Fluid Modifier - Softbody Modifier Differential Revision: https://developer.blender.org/D8747
2020-10-01 16:38:00 +02:00
/* clang-format off */