archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
c44a17ec4b247b0af5e4c58bbcfca6dece51baf1
blender-archive/source/blender/makesrna/intern/rna_modifier.c

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

7373 lines
311 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +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
* along with this program; if not, write to the Free Software Foundation,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
*/
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup RNA
doxygen: blender/makesrna tagged.
2011-02-27 20:20:01 +00:00
*/
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
#include <float.h>
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
#include <limits.h>
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
#include <stdlib.h>
Added RNA for Armature modifier
2009-01-02 01:28:02 +00:00
#include "DNA_armature_types.h"
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
#include "DNA_cachefile_types.h"
- remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
#include "DNA_mesh_types.h"
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
#include "DNA_modifier_types.h"
Cleanup: add _types.h suffix to DNA headers
2018-02-07 11:14:08 +11:00
#include "DNA_object_force_types.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "DNA_object_types.h"
Added RNA for the Build modifier.
2009-01-01 21:49:04 +00:00
#include "DNA_scene_types.h"
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
- remove unused includes IMB_*, BIF_* & MEM_* - remove MEM_guardedalloc.h from header files (include directly)
2010-08-16 05:46:10 +00:00
#include "MEM_guardedalloc.h"
fixes for screw modifier - steps for a closed screw was off by 1 - screw offset wasnt being copied
2010-03-22 08:49:12 +00:00
#include "BLI_math.h"
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
#include "BLT_translation.h"
i18n: "labels" of multi-section enums need to be marked for gettext (N_()), as they are not available from python...
2012-04-13 20:25:05 +00:00
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
#include "BKE_animsys.h"
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
#include "BKE_curveprofile.h"
Cleanup: rename BKE's 'object_data_transfer' to 'data_transfer' to avoid same file names with ED_object's one.
2015-01-12 12:03:28 +01:00
#include "BKE_data_transfer.h"
Dynamic Paint: * Enabled modifier "Apply" button since it can now be used to apply displacement or output layers to the mesh. * Default surface output names are now unique in case canvas has multiple surfaces of same type. * Merged "face aligned" and "non-closed" brush options to a single "Project" toggle, available for "Proximity" brushes. * Added more icons to user interface selections. * Increased default proximity distance. * Set proximity falloff ramp to only affect alpha by default. * Removed some no longer required render ext. functions. * Fix: geometry node vertex alpha didn't work unless "Vertex Color Paint/Light" was enabled from material.
2011-09-10 08:55:44 +00:00
#include "BKE_dynamicpaint.h"
Debug drawing for simulations, to aid in visualizing abstract data such as forces, velocities, contact points etc. This uses a hash table to store debug elements (dots, lines, vectors at this point). The hash table allows continuous display of elements that are generated only in certain time steps, e.g. contact points, while avoiding massive memory allocation. In any case, this system is really a development feature, but very helpful in finding issues with the internal solver data.
2014-08-30 17:54:36 +02:00
#include "BKE_effect.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */
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
#include "BKE_idprop.h"
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
#include "BKE_mesh_mapping.h"
#include "BKE_mesh_remap.h"
Fix #22239: external btx won't load.
2010-06-01 19:26:35 +00:00
#include "BKE_multires.h"
Ocean Modifier: refactored the delayed-refresh approach The approach of setting 'refresh' flags on the modifier, and performing the associated actions when the modifier is being evaluated, is a bad one. Instead, we use the separation of the original and the evaluated copy to 'refresh' certain things (because they simply aren't set at all on the original). Other actions are now done directly with BKE_ocean_xxx functions on the original data, intead of during evaluation.
2018-07-05 16:23:35 +02:00
#include "BKE_ocean.h"
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
#include "RNA_access.h"
use bool for rna funcs.
2013-03-07 02:44:55 +00:00
#include "RNA_define.h"
#include "RNA_enum_types.h"
#include "rna_internal.h"
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
#include "WM_api.h"
* Added notifier updates for RNA modifier data
2009-01-03 07:25:22 +00:00
#include "WM_types.h"
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
#include "MOD_nodes.h"
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
i18n: "labels" of multi-section enums need to be marked for gettext (N_()), as they are not available from python...
2012-04-13 20:25:05 +00:00
{0, "", 0, N_("Modify"), ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_DataTransfer,
"DATA_TRANSFER",
ICON_MOD_DATA_TRANSFER,
"Data Transfer",
"Transfer several types of data (vertex groups, UV maps, vertex colors, custom normals) from "
"one mesh to another"},
{eModifierType_MeshCache,
"MESH_CACHE",
ICON_MOD_MESHDEFORM,
"Mesh Cache",
"Deform the mesh using an external frame-by-frame vertex transform cache"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_MeshSequenceCache,
"MESH_SEQUENCE_CACHE",
ICON_MOD_MESHDEFORM,
"Mesh Sequence Cache",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Deform the mesh or curve using an external mesh cache in Alembic format"},
{eModifierType_NormalEdit,
"NORMAL_EDIT",
ICON_MOD_NORMALEDIT,
"Normal Edit",
"Modify the direction of the surface normals"},
{eModifierType_WeightedNormal,
"WEIGHTED_NORMAL",
ICON_MOD_NORMALEDIT,
"Weighted Normal",
"Modify the direction of the surface normals using a weighting method"},
{eModifierType_UVProject,
"UV_PROJECT",
ICON_MOD_UVPROJECT,
"UV Project",
"Project the UV map coordinates from the negative Z axis of another object"},
{eModifierType_UVWarp,
"UV_WARP",
ICON_MOD_UVPROJECT,
"UV Warp",
Cleanup: spelling, comments
2020-03-29 16:33:51 +11:00
"Transform the UV map using the difference between two objects"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_WeightVGEdit,
"VERTEX_WEIGHT_EDIT",
ICON_MOD_VERTEX_WEIGHT,
"Vertex Weight Edit",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Modify of the weights of a vertex group"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_WeightVGMix,
"VERTEX_WEIGHT_MIX",
ICON_MOD_VERTEX_WEIGHT,
"Vertex Weight Mix",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Mix the weights of two vertex groups"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_WeightVGProximity,
"VERTEX_WEIGHT_PROXIMITY",
ICON_MOD_VERTEX_WEIGHT,
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Vertex Weight Proximity",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Set the vertex group weights based on the distance to another target object"},
i18n: "labels" of multi-section enums need to be marked for gettext (N_()), as they are not available from python...
2012-04-13 20:25:05 +00:00
{0, "", 0, N_("Generate"), ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Array,
"ARRAY",
Ocean Modifier: Add viewport resolution Following work done in 2.83, the resolution control is now a real level-of-detail parameter. It is now useful to be able to set the resolution for display independently from render. This is true for both mesh generation and mesh deformation modes. For compatibility with old scenes, resolution is retained and is the render resolution. Old modifiers loaded have the value of resolution also applied to viewport resolution. This allows newer modifiers to be used in older versions without trouble Differential Revision: https://developer.blender.org/D8336
2020-08-03 10:08:31 -04:00
ICON_MOD_ARRAY,
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Array",
"Create copies of the shape with offsets"},
{eModifierType_Bevel,
"BEVEL",
ICON_MOD_BEVEL,
"Bevel",
"Generate sloped corners by adding geometry to the mesh's edges or vertices"},
{eModifierType_Boolean,
"BOOLEAN",
ICON_MOD_BOOLEAN,
"Boolean",
"Use another shape to cut, combine or perform a difference operation"},
{eModifierType_Build,
"BUILD",
ICON_MOD_BUILD,
"Build",
"Cause the faces of the mesh object to appear or disappear one after the other over time"},
{eModifierType_Decimate,
"DECIMATE",
ICON_MOD_DECIM,
"Decimate",
"Reduce the geometry density"},
{eModifierType_EdgeSplit,
"EDGE_SPLIT",
ICON_MOD_EDGESPLIT,
"Edge Split",
"Split away joined faces at the edges"},
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
{eModifierType_Nodes, "NODES", ICON_NODETREE, "Geometry Nodes", ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Mask,
"MASK",
ICON_MOD_MASK,
"Mask",
"Dynamically hide vertices based on a vertex group or armature"},
{eModifierType_Mirror,
"MIRROR",
ICON_MOD_MIRROR,
"Mirror",
"Mirror along the local X, Y and/or Z axes, over the object origin"},
UI: Sort "Volume to Mesh" and "Mesh to Volume" in alphabetical order
2020-10-20 00:12:45 +02:00
{eModifierType_MeshToVolume,
"MESH_TO_VOLUME",
ICON_VOLUME_DATA,
"Mesh to Volume",
""}, /* TODO: Use correct icon. */
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Multires,
"MULTIRES",
ICON_MOD_MULTIRES,
"Multiresolution",
"Subdivide the mesh in a way that allows editing the higher subdivision levels"},
{eModifierType_Remesh,
"REMESH",
ICON_MOD_REMESH,
"Remesh",
"Generate new mesh topology based on the current shape"},
{eModifierType_Screw,
"SCREW",
ICON_MOD_SCREW,
"Screw",
Fix many typos and other issues in UI messages.
2020-02-17 13:00:01 +01:00
"Lathe around an axis, treating the input mesh as a profile"},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Skin,
"SKIN",
ICON_MOD_SKIN,
"Skin",
"Create a solid shape from vertices and edges, using the vertex radius to define the "
"thickness"},
{eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", " Make the surface thick"},
{eModifierType_Subsurf,
"SUBSURF",
ICON_MOD_SUBSURF,
"Subdivision Surface",
"Split the faces into smaller parts, giving it a smoother appearance"},
{eModifierType_Triangulate,
"TRIANGULATE",
ICON_MOD_TRIANGULATE,
"Triangulate",
"Convert all polygons to triangles"},
UI: Sort "Volume to Mesh" and "Mesh to Volume" in alphabetical order
2020-10-20 00:12:45 +02:00
{eModifierType_VolumeToMesh,
"VOLUME_TO_MESH",
ICON_VOLUME_DATA,
"Volume to Mesh",
""}, /* TODO: Use correct icon. */
Fix: Alphabeticalize Object Modifiers Reported by Dalai on the live stream
2020-02-17 15:03:27 -05:00
{eModifierType_Weld,
Cleanup: clang-format.
2020-02-18 16:38:57 +01:00
"WELD",
ICON_AUTOMERGE_OFF,
"Weld",
Cleanup: Imperative tense in property description
2020-11-12 04:56:39 +01:00
"Find groups of vertices closer than dist and merge them together"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_Wireframe,
"WIREFRAME",
ICON_MOD_WIREFRAME,
"Wireframe",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Convert faces into thickened edges"},
i18n: "labels" of multi-section enums need to be marked for gettext (N_()), as they are not available from python...
2012-04-13 20:25:05 +00:00
{0, "", 0, N_("Deform"), ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Armature,
"ARMATURE",
ICON_MOD_ARMATURE,
"Armature",
"Deform the shape using an armature object"},
{eModifierType_Cast,
"CAST",
ICON_MOD_CAST,
"Cast",
"Shift the shape towards a predefined primitive"},
{eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", "Bend the mesh using a curve object"},
{eModifierType_Displace,
"DISPLACE",
ICON_MOD_DISPLACE,
"Displace",
"Offset vertices based on a texture"},
{eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", "Deform specific points using another object"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_LaplacianDeform,
"LAPLACIANDEFORM",
ICON_MOD_MESHDEFORM,
"Laplacian Deform",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Deform based a series of anchor points"},
{eModifierType_Lattice,
"LATTICE",
ICON_MOD_LATTICE,
"Lattice",
"Deform using the shape of a lattice object"},
{eModifierType_MeshDeform,
"MESH_DEFORM",
ICON_MOD_MESHDEFORM,
"Mesh Deform",
"Deform using a different mesh, which acts as a deformation cage"},
{eModifierType_Shrinkwrap,
"SHRINKWRAP",
ICON_MOD_SHRINKWRAP,
"Shrinkwrap",
"Project the shape onto another object"},
{eModifierType_SimpleDeform,
"SIMPLE_DEFORM",
ICON_MOD_SIMPLEDEFORM,
"Simple Deform",
"Deform the shape by twisting, bending, tapering or stretching"},
{eModifierType_Smooth,
"SMOOTH",
ICON_MOD_SMOOTH,
"Smooth",
"Smooth the mesh by flattening the angles between adjacent faces"},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_CorrectiveSmooth,
"CORRECTIVE_SMOOTH",
ICON_MOD_SMOOTH,
"Smooth Corrective",
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
"Smooth the mesh while still preserving the volume"},
{eModifierType_LaplacianSmooth,
"LAPLACIANSMOOTH",
ICON_MOD_SMOOTH,
"Smooth Laplacian",
"Reduce the noise on a mesh surface with minimal changes to its shape"},
{eModifierType_SurfaceDeform,
"SURFACE_DEFORM",
ICON_MOD_MESHDEFORM,
"Surface Deform",
"Transfer motion from another mesh"},
{eModifierType_Warp,
"WARP",
ICON_MOD_WARP,
"Warp",
"Warp parts of a mesh to a new location in a very flexible way thanks to 2 specified "
"objects"},
{eModifierType_Wave,
"WAVE",
ICON_MOD_WAVE,
"Wave",
"Adds a ripple-like motion to an object’s geometry"},
Volumes: new Volume Displace modifier This modifier uses a 3D texture to displace a volume. For now, this can only use the previously existing texture system, because we do not have a better alternative yet. Still, the results can be quite good and interesting. See D9075 for some examples. Reviewers: brecht, simonthommes Differential Revision: https://developer.blender.org/D9075
2020-10-07 18:03:07 +02:00
{eModifierType_VolumeDisplace,
"VOLUME_DISPLACE",
ICON_VOLUME_DATA,
"Volume Displace",
"Deform volume based on noise or other vector fields"}, /* TODO: Use correct icon. */
Modifiers: Rename Simulate category to Physics While the name "Simulate" might be more accurate, there is a naming collision with the new modifier added in D7549. Therefore, we decided to rename the category for now.
2020-05-04 12:24:12 +02:00
{0, "", 0, N_("Physics"), ""},
UI: icon set updates Andrzej Ambroz. This adds and changes various icons, in particular modifier and force field icons are now included.
2018-10-16 20:20:24 +02:00
{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Explode,
"EXPLODE",
ICON_MOD_EXPLODE,
"Explode",
"Break apart the mesh faces and let them follow particles"},
UI: Remove 'Simulation' from 'Fluid Simulation' modifier This is conistent with other modifiers and is reduntent with the 'Simulate' menu header.
2020-04-04 12:31:33 -04:00
{eModifierType_Fluid, "FLUID", ICON_MOD_FLUIDSIM, "Fluid", ""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", "Generate a moving ocean surface"},
UI: icon set updates Andrzej Ambroz, and various fixes. * Text editor word wrap, line numbers & syntax toggles now use consistent icons that don’t change when you enable or disable them. * Replaced icon toggle buttons in the snapping popover with normal checkboxes and descriptive text labels. This makes it clearer which item is the main radio button, is more consistent with other popovers, and allows us to use more descriptive text. * Added correct icons for grease pencil add menu. * Added bespoke icons for grease pencil modifiers. * Added icon for particle instance modifier. * Added icon for fake user on & off states. * Added correct icons for enabling/disabling modifiers in the dopesheet & f-curve editor. * Made it so the restrict viewport & restrict render toggles for modifier update correctly when enabled or disabled, by flipping the order in the icon sheet. This also required changing the outliner to match. * Removed the few old remaining icons in the old style and made sure to replace the last places where they were used. * Updated many icons to be clearer & more consistent.
2018-10-28 17:51:40 +01:00
{eModifierType_ParticleInstance,
"PARTICLE_INSTANCE",
ICON_MOD_PARTICLE_INSTANCE,
"Particle Instance",
""},
UI: Add tooltips for modifiers When adding a modifier to an object, the drop-down select box has the same mouse-over tooltip for each modifier type: "Add a procedural operation/effect to the active object". This isn't helpful when you don't know what the modifier does from just reading the name. This patch adds descriptions for most modifier types, so that it's clearer what the modifiers do. The text was provided by @werwack after discussion on DevTalk[1] and taken from the Blender Manual, and subsequently updated by @billreynish and @HooglyBoogly. Not all modifiers have a short one-line description in the manual, hence those are still missing in this patch. [1] https://devtalk.blender.org/t/ui-contextual-modifier-description-in-the-tooltips-of-the-add-modifier-dialog-window/10382 Reviewed By: billreynish Differential Revision: https://developer.blender.org/D6352
2019-12-03 18:10:50 +01:00
{eModifierType_ParticleSystem,
"PARTICLE_SYSTEM",
ICON_MOD_PARTICLES,
"Particle System",
"Spawn particles from the shape"},
Fix various icon related issues: * Used correct icons for Tracking. * Flip Copy/Paste icons so they are correct. * Add correct icon for softbody modifier. * Replace speaker icons for enabling F-Curves with checkboxes.
2018-10-22 19:19:15 +02:00
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
UI: new icon set by Andrzej Ambroz. This is a monochrome icon set, with a more modern look and icons for various features that did not have a proper icon before.
2018-10-01 10:45:50 +02:00
{eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
UI: * Made separator item work horizontal & vertical. * Add colon (:) automatic for int/float/enum/string. * Added space variables to uiStyle and use them in the layout engine. * Added initial World buttons by Thomas Dinges, thanks! * Added some code for modifiers in the Object Data context. This will become a template though. * Use a common poll() callback in the scripts to reduce code.
2009-04-27 18:05:58 +00:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[] = {
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
{MOD_TRIANGULATE_QUAD_BEAUTY,
"BEAUTY",
0,
UI: Fixes and small improvements to some labels and UI messages Small tweaks to make labels and texts more correct, consistent and polished. Reviewed by: Aaron Carlisle, Julian Eisel Differential Revision: https://developer.blender.org/D8346
2020-08-06 14:48:47 +02:00
"Beauty",
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
"Split the quads in nice triangles, slower method"},
{MOD_TRIANGULATE_QUAD_FIXED,
"FIXED",
0,
"Fixed",
"Split the quads on the first and third vertices"},
UI messages fixes...
2013-11-04 18:58:22 +00:00
{MOD_TRIANGULATE_QUAD_ALTERNATE,
"FIXED_ALTERNATE",
0,
"Fixed Alternate",
Cleanup: indentation, wrapping Mostly functions wrapping args, not confirming to our style guide.
2019-03-15 08:53:22 +11:00
"Split the quads on the 2nd and 4th vertices"},
UI messages fixes...
2013-11-04 18:58:22 +00:00
{MOD_TRIANGULATE_QUAD_SHORTEDGE,
"SHORTEST_DIAGONAL",
0,
"Shortest Diagonal",
Cleanup: indentation, wrapping Mostly functions wrapping args, not confirming to our style guide.
2019-03-15 08:53:22 +11:00
"Split the quads based on the distance between the vertices"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_modifier_triangulate_ngon_method_items[] = {
Modifier: rename triangulate scanfill to ear-clip
2014-02-21 15:03:34 +11:00
{MOD_TRIANGULATE_NGON_BEAUTY,
"BEAUTY",
0,
"Beauty",
"Arrange the new triangles evenly (slow)"},
{MOD_TRIANGULATE_NGON_EARCLIP,
"CLIP",
0,
"Clip",
"Split the polygons with an ear clipping algorithm"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
};
Implement additional modes for Shrinkwrap to a surface. In addition to the original map to surface and Keep Above Surface, add modes that only affect vertices that are inside or outside the object. This is inspired by the Limit Distance constraint, and can be useful for crude collision detection in rigs. The inside/outside test works based on face normals and may not be completely reliable near 90 degree or sharper angles in the target. Reviewers: campbellbarton, mont29 Differential Revision: https://developer.blender.org/D3717
2018-07-07 18:39:45 +03:00
const EnumPropertyItem rna_enum_modifier_shrinkwrap_mode_items[] = {
{MOD_SHRINKWRAP_ON_SURFACE,
"ON_SURFACE",
0,
"On Surface",
"The point is constrained to the surface of the target object, "
"with distance offset towards the original point location"},
{MOD_SHRINKWRAP_INSIDE,
"INSIDE",
0,
"Inside",
"The point is constrained to be inside the target object"},
{MOD_SHRINKWRAP_OUTSIDE,
"OUTSIDE",
0,
"Outside",
"The point is constrained to be outside the target object"},
{MOD_SHRINKWRAP_OUTSIDE_SURFACE,
"OUTSIDE_SURFACE",
0,
"Outside Surface",
"The point is constrained to the surface of the target object, "
"with distance offset always to the outside, towards or away from the original location"},
{MOD_SHRINKWRAP_ABOVE_SURFACE,
"ABOVE_SURFACE",
0,
"Above Surface",
"The point is constrained to the surface of the target object, "
"with distance offset applied exactly along the target normal"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Implement additional modes for Shrinkwrap to a surface. In addition to the original map to surface and Keep Above Surface, add modes that only affect vertices that are inside or outside the object. This is inspired by the Limit Distance constraint, and can be useful for crude collision detection in rigs. The inside/outside test works based on face normals and may not be completely reliable near 90 degree or sharper angles in the target. Reviewers: campbellbarton, mont29 Differential Revision: https://developer.blender.org/D3717
2018-07-07 18:39:45 +03:00
};
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
#ifndef RNA_RUNTIME
/* use eWarp_Falloff_*** & eHook_Falloff_***, they're in sync */
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem modifier_warp_falloff_items[] = {
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
{eWarp_Falloff_None, "NONE", 0, "No Falloff", ""},
{eWarp_Falloff_Curve, "CURVE", 0, "Curve", ""},
{eWarp_Falloff_Smooth, "SMOOTH", ICON_SMOOTHCURVE, "Smooth", ""},
{eWarp_Falloff_Sphere, "SPHERE", ICON_SPHERECURVE, "Sphere", ""},
{eWarp_Falloff_Root, "ROOT", ICON_ROOTCURVE, "Root", ""},
{eWarp_Falloff_InvSquare, "INVERSE_SQUARE", ICON_ROOTCURVE, "Inverse Square", ""},
{eWarp_Falloff_Sharp, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
{eWarp_Falloff_Linear, "LINEAR", ICON_LINCURVE, "Linear", ""},
{eWarp_Falloff_Const, "CONSTANT", ICON_NOCURVE, "Constant", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
};
#endif
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
/* ***** Data Transfer ***** */
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_method_vertex_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_TOPOLOGY, "TOPOLOGY", 0, "Topology", "Copy from identical topology meshes"},
UI: Use Proper Title Case
2020-06-07 19:00:47 -04:00
{MREMAP_MODE_VERT_NEAREST, "NEAREST", 0, "Nearest Vertex", "Copy from closest vertex"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_VERT_EDGE_NEAREST,
"EDGE_NEAREST",
0,
"Nearest Edge Vertex",
"Copy from closest vertex of closest edge"},
{MREMAP_MODE_VERT_EDGEINTERP_NEAREST,
"EDGEINTERP_NEAREST",
0,
"Nearest Edge Interpolated",
"Copy from interpolated values of vertices from closest point on closest edge"},
{MREMAP_MODE_VERT_POLY_NEAREST,
"POLY_NEAREST",
0,
"Nearest Face Vertex",
"Copy from closest vertex of closest face"},
{MREMAP_MODE_VERT_POLYINTERP_NEAREST,
"POLYINTERP_NEAREST",
0,
"Nearest Face Interpolated",
"Copy from interpolated values of vertices from closest point on closest face"},
{MREMAP_MODE_VERT_POLYINTERP_VNORPROJ,
"POLYINTERP_VNORPROJ",
0,
"Projected Face Interpolated",
"Copy from interpolated values of vertices from point on closest face hit by "
"normal-projection"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_method_edge_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_TOPOLOGY, "TOPOLOGY", 0, "Topology", "Copy from identical topology meshes"},
{MREMAP_MODE_EDGE_VERT_NEAREST,
"VERT_NEAREST",
0,
"Nearest Vertices",
Cleanup: spelling Also use doxy formatting for warning/note.
2016-01-17 13:40:30 +11:00
"Copy from most similar edge (edge which vertices are the closest of destination edge's "
"ones)"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_EDGE_NEAREST,
"NEAREST",
0,
"Nearest Edge",
"Copy from closest edge (using midpoints)"},
{MREMAP_MODE_EDGE_POLY_NEAREST,
"POLY_NEAREST",
0,
"Nearest Face Edge",
"Copy from closest edge of closest face (using midpoints)"},
{MREMAP_MODE_EDGE_EDGEINTERP_VNORPROJ,
"EDGEINTERP_VNORPROJ",
0,
"Projected Edge Interpolated",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Interpolate all source edges hit by the projection of destination one along its own normal "
"(from vertices)"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_method_loop_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_TOPOLOGY, "TOPOLOGY", 0, "Topology", "Copy from identical topology meshes"},
{MREMAP_MODE_LOOP_NEAREST_LOOPNOR,
"NEAREST_NORMAL",
0,
Cleanup: Fix capitalization in various UI strings Approximately 195 changes of capitalization to conform to MLA title style. UI labels and property names should use MLA title case, while descriptions should be capitalized like regular prose, generally with only the start of a sentence capitalized. Differential Revision: https://developer.blender.org/D9922
2020-12-24 11:07:32 -06:00
"Nearest Corner and Best Matching Normal",
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
"Copy from nearest corner which has the best matching normal"},
{MREMAP_MODE_LOOP_NEAREST_POLYNOR,
"NEAREST_POLYNOR",
0,
Cleanup: Fix capitalization in various UI strings Approximately 195 changes of capitalization to conform to MLA title style. UI labels and property names should use MLA title case, while descriptions should be capitalized like regular prose, generally with only the start of a sentence capitalized. Differential Revision: https://developer.blender.org/D9922
2020-12-24 11:07:32 -06:00
"Nearest Corner and Best Matching Face Normal",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Copy from nearest corner which has the face with the best matching normal to destination "
"corner's face one"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_LOOP_POLY_NEAREST,
"NEAREST_POLY",
0,
Cleanup: Fix capitalization in various UI strings Approximately 195 changes of capitalization to conform to MLA title style. UI labels and property names should use MLA title case, while descriptions should be capitalized like regular prose, generally with only the start of a sentence capitalized. Differential Revision: https://developer.blender.org/D9922
2020-12-24 11:07:32 -06:00
"Nearest Corner of Nearest Face",
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
"Copy from nearest corner of nearest polygon"},
{MREMAP_MODE_LOOP_POLYINTERP_NEAREST,
"POLYINTERP_NEAREST",
0,
"Nearest Face Interpolated",
"Copy from interpolated corners of the nearest source polygon"},
{MREMAP_MODE_LOOP_POLYINTERP_LNORPROJ,
"POLYINTERP_LNORPROJ",
0,
"Projected Face Interpolated",
"Copy from interpolated corners of the source polygon hit by corner normal projection"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_method_poly_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_TOPOLOGY, "TOPOLOGY", 0, "Topology", "Copy from identical topology meshes"},
{MREMAP_MODE_POLY_NEAREST,
"NEAREST",
0,
"Nearest Face",
"Copy from nearest polygon (using center points)"},
{MREMAP_MODE_POLY_NOR,
"NORMAL",
0,
"Best Normal-Matching",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Copy from source polygon which normal is the closest to destination one"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{MREMAP_MODE_POLY_POLYINTERP_PNORPROJ,
"POLYINTERP_PNORPROJ",
0,
"Projected Face Interpolated",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Interpolate all source polygons intersected by the projection of destination one along its "
"own normal"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_mix_mode_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{CDT_MIX_TRANSFER, "REPLACE", 0, "Replace", "Overwrite all elements' data"},
{CDT_MIX_REPLACE_ABOVE_THRESHOLD,
"ABOVE_THRESHOLD",
0,
"Above Threshold",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Only replace destination elements where data is above given threshold (exact behavior "
"depends on data type)"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{CDT_MIX_REPLACE_BELOW_THRESHOLD,
"BELOW_THRESHOLD",
0,
"Below Threshold",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Only replace destination elements where data is below given threshold (exact behavior "
"depends on data type)"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{CDT_MIX_MIX,
"MIX",
0,
"Mix",
"Mix source value into destination one, using given threshold as factor"},
{CDT_MIX_ADD,
"ADD",
0,
"Add",
"Add source value to destination one, using given threshold as factor"},
{CDT_MIX_SUB,
"SUB",
0,
"Subtract",
"Subtract source value to destination one, using given threshold as factor"},
{CDT_MIX_MUL,
"MUL",
0,
"Multiply",
"Multiply source value to destination one, using given threshold as factor"},
/* etc. etc. */
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_layers_select_src_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{DT_LAYERS_ACTIVE_SRC, "ACTIVE", 0, "Active Layer", "Only transfer active data layer"},
{DT_LAYERS_ALL_SRC, "ALL", 0, "All Layers", "Transfer all data layers"},
{DT_LAYERS_VGROUP_SRC_BONE_SELECT,
"BONE_SELECT",
0,
"Selected Pose Bones",
Fix UI messages (own stupidness even :/ ).
2015-01-13 21:03:15 +01:00
"Transfer all vertex groups used by selected pose bones"},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{DT_LAYERS_VGROUP_SRC_BONE_DEFORM,
"BONE_DEFORM",
0,
"Deform Pose Bones",
"Transfer all vertex groups used by deform bones"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_dt_layers_select_dst_items[] = {
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
{DT_LAYERS_ACTIVE_DST, "ACTIVE", 0, "Active Layer", "Affect active data layer of all targets"},
{DT_LAYERS_NAME_DST, "NAME", 0, "By Name", "Match target data layers to affect by name"},
{DT_LAYERS_INDEX_DST,
"INDEX",
0,
"By Order",
"Match target data layers to affect by order (indices)"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_axis_xy_items[] = {
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
{0, "X", 0, "X", ""},
{1, "Y", 0, "Y", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_axis_xyz_items[] = {
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
{0, "X", 0, "X", ""},
{1, "Y", 0, "Y", ""},
{2, "Z", 0, "Z", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
};
Transfer Data: add main core code and operators. This add code needed to map a CD data layout from source mesh towards destination one, and code needed to actually transfer data, using BKE's mesh remap generated data. This allows to transfer most CD layers (vgroups, vcols, uvs...) as well as fake, boolean ones (like smooth/sharp edges/faces, etc.). Some types are not yet transferable, mainly shape keys, this is known TODO. Data transfer can also use some advanced mixing in some cases (mostly, vgroups and vcols). Notes: * New transfer operators transfer data from active object towards selected ones. * Modifier will be committed separately. * Old weight transfer code (for vgroups) is kept for now, mostly because it is the only usable one in weightpaint mode (it transfers from selected object to active one, this is not sensible in Object mode, but needed in WeightPaint one). This will be addressed soon. Again, heavily reviewed and enhanced by Campbell, thanks!
2015-01-09 19:11:40 +01:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = {
Select mirror multiple axis support Previously you could only select mirror on X axis, now support mirroring on multiple axis as well as more than one (for mesh and lattice data).
2016-01-07 20:54:17 +11:00
{(1 << 0), "X", 0, "X", ""},
{(1 << 1), "Y", 0, "Y", ""},
{(1 << 2), "Z", 0, "Z", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Select mirror multiple axis support Previously you could only select mirror on X axis, now support mirroring on multiple axis as well as more than one (for mesh and lattice data).
2016-01-07 20:54:17 +11:00
};
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
#ifdef RNA_RUNTIME
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
# include "DNA_curve_types.h"
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
# include "DNA_fluid_types.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
# include "DNA_particle_types.h"
Smoke Patch + additions: a) Applying patch #22765 by Miika Hämäläinen (domain border collision settings, vorticity settings, time scale, non absolute density, smooth high res emitter, initial velocity multiplier, high res strength available to be set to 0), b) Additions by me: --Initial velocity is now per flow object, not per domain; --Using boundingbox as standard display mode for domains (was wire before); --When adding a flow object, an initial nice SmokeParticle system is added too with nice initial settings (life=1, no_render, unborn, etc) fitting smoke simulation; --Adaptive timesteps introduced to the smoke sim (depending on the magnitude of the velocity) because it was quite unstable when used for fire simulations, still needs to be tested and will also slow down some simulations.
2010-07-27 14:53:20 +00:00
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
# include "BKE_cachefile.h"
* Added notifier updates for RNA modifier data
2009-01-03 07:25:22 +00:00
# include "BKE_context.h"
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
# include "BKE_mesh_runtime.h"
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
# include "BKE_modifier.h"
edits to r60777 - move ED_object_hook_reset_do into BKE object (if RNA needs to call ED_* functions its a hint they might be better in BKE).
2013-10-15 20:15:45 +00:00
# include "BKE_object.h"
Smoke Patch + additions: a) Applying patch #22765 by Miika Hämäläinen (domain border collision settings, vorticity settings, time scale, non absolute density, smooth high res emitter, initial velocity multiplier, high res strength available to be set to 0), b) Additions by me: --Initial velocity is now per flow object, not per domain; --Using boundingbox as standard display mode for domains (was wire before); --When adding a flow object, an initial nice SmokeParticle system is added too with nice initial settings (life=1, no_render, unborn, etc) fitting smoke simulation; --Adaptive timesteps introduced to the smoke sim (depending on the magnitude of the velocity) because it was quite unstable when used for fire simulations, still needs to be tested and will also slow down some simulations.
2010-07-27 14:53:20 +00:00
# include "BKE_particle.h"
* Added notifier updates for RNA modifier data
2009-01-03 07:25:22 +00:00
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
# include "BLI_sort_utils.h"
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
# include "DEG_depsgraph.h"
# include "DEG_depsgraph_build.h"
Data Transfer Modifier: fix mesh_get_eval_final usage. It can't be used during modifier evaluation, and rna enum code should access the evaluated objects.
2018-12-03 16:56:11 +03:00
# include "DEG_depsgraph_query.h"
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
# ifdef WITH_ALEMBIC
# include "ABC_alembic.h"
# endif
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
static void rna_UVProject_projectors_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
UVProjectModifierData *uvp = (UVProjectModifierData *)ptr->data;
rna_iterator_array_begin(
iter, (void *)uvp->projectors, sizeof(Object *), uvp->num_projectors, 0, NULL);
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
}
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ModifierData *md = (ModifierData *)ptr->data;
Modifiers: add StructRNA pointer field to ModifierTypeInfo This reduces the number of places that have to be modified when a new modifier is added. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D9000
2020-09-25 12:49:18 +02:00
const ModifierTypeInfo *modifier_type = BKE_modifier_get_info(md->type);
if (modifier_type != NULL) {
return modifier_type->srna;
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
return &RNA_Modifier;
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
code cleanup: make many functions static
2012-09-22 14:07:55 +00:00
static void rna_Modifier_name_set(PointerRNA *ptr, const char *value)
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
{
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
ModifierData *md = ptr->data;
no functional changes. use sizeof() and MAXFRAME
2010-04-04 14:33:41 +00:00
char oldname[sizeof(md->name)];
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
/* make a copy of the old name first */
no functional changes. use sizeof() and MAXFRAME
2010-04-04 14:33:41 +00:00
BLI_strncpy(oldname, md->name, sizeof(md->name));
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* copy the new name into the name slot */
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid. also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
BLI_strncpy_utf8(md->name, value, sizeof(md->name));
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
/* make sure the name is truly unique */
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
if (ptr->owner_id) {
Object *ob = (Object *)ptr->owner_id;
Fix T76498: Refactoring - Rename BKE modifiers funtions
2020-05-08 10:14:02 +02:00
BKE_modifier_unique_name(&ob->modifiers, md);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
/* fix all the animation data which may link to this */
Cleanup: use BKE_animdata_* prefix
2015-04-04 15:13:56 +11:00
BKE_animdata_fix_paths_rename_all(NULL, "modifiers", oldname, md->name);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
}
UI: * Added Constraints template and Add Constraint operator. * Added toggle=True/False parameter to uiItemR, to get a toggle button (actual button) rather than an "option" button (checkbox) * Added OPTION/OPTIONN button type, to distinguish with TOG/TOGN. RNA: * Make all modifier pointers editable, including correct updates. * Added notifiers and updates to constraints. * Fix a stack corruption, pointed out by Andrea, and potentially causing crashes.
2009-05-27 00:03:49 +00:00
static char *rna_Modifier_path(PointerRNA *ptr)
{
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 20:10:22 +00:00
ModifierData *md = ptr->data;
char name_esc[sizeof(md->name) * 2];
Cleanup: rename BLI_strescape to BLI_str_escape Prepare for `BLI_str_unescape` which doesn't read well without the separator.
2020-12-10 13:25:49 +11:00
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 20:10:22 +00:00
return BLI_sprintfN("modifiers[\"%s\"]", name_esc);
UI: * Added Constraints template and Add Constraint operator. * Added toggle=True/False parameter to uiItemR, to get a toggle button (actual button) rather than an "option" button (checkbox) * Added OPTION/OPTIONN button type, to distinguish with TOG/TOGN. RNA: * Make all modifier pointers editable, including correct updates. * Added notifiers and updates to constraints. * Fix a stack corruption, pointed out by Andrea, and potentially causing crashes.
2009-05-27 00:03:49 +00:00
}
tag unused rna args.
2011-05-31 02:14:25 +00:00
static void rna_Modifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
* Added notifier updates for RNA modifier data
2009-01-03 07:25:22 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ptr->owner_id);
* Added notifier updates for RNA modifier data
2009-01-03 07:25:22 +00:00
}
RNA: * Property update functions no longer get context, instead they get only Main and Scene. The RNA api was intended to be as context-less as possible, since it doesn't really matter who is changing the property, everything that uses the property should be updated. * There's still one exception case that use it now, screen operations still depend on context too much. It also revealed a few places using context where they shouldn't. * Ideally Scene shouldn't be passed, but much of Blender still depends on it, should be dropped when we try to support multiple scene editing. Change was planned for a while, but need this now to be able to call update without a context pointer.
2009-12-08 17:23:48 +00:00
static void rna_Modifier_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)
UI: * Added Constraints template and Add Constraint operator. * Added toggle=True/False parameter to uiItemR, to get a toggle button (actual button) rather than an "option" button (checkbox) * Added OPTION/OPTIONN button type, to distinguish with TOG/TOGN. RNA: * Make all modifier pointers editable, including correct updates. * Added notifiers and updates to constraints. * Fix a stack corruption, pointed out by Andrea, and potentially causing crashes.
2009-05-27 00:03:49 +00:00
{
RNA: * Property update functions no longer get context, instead they get only Main and Scene. The RNA api was intended to be as context-less as possible, since it doesn't really matter who is changing the property, everything that uses the property should be updated. * There's still one exception case that use it now, screen operations still depend on context too much. It also revealed a few places using context where they shouldn't. * Ideally Scene shouldn't be passed, but much of Blender still depends on it, should be dropped when we try to support multiple scene editing. Change was planned for a while, but need this now to be able to call update without a context pointer.
2009-12-08 17:23:48 +00:00
rna_Modifier_update(bmain, scene, ptr);
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
UI: * Added Constraints template and Add Constraint operator. * Added toggle=True/False parameter to uiItemR, to get a toggle button (actual button) rather than an "option" button (checkbox) * Added OPTION/OPTIONN button type, to distinguish with TOG/TOGN. RNA: * Make all modifier pointers editable, including correct updates. * Added notifiers and updates to constraints. * Fix a stack corruption, pointed out by Andrea, and potentially causing crashes.
2009-05-27 00:03:49 +00:00
}
Geometry Nodes: active modifier + geometry nodes editor This commit adds functions to set and get the object's active modifier, which is stored as a flag in the ModifierData struct, similar to constraints. This will be used to set the context in the node editor. There are no visible changes in this commit. Similar to how the node editor context works for materials, this commit makes the node group displayed in the node editor depend on the active object and its active modifier. To keep the node group from changing, just pin the node group in the header. * Shortcuts performed while there is an active modifier will affect only that modifier (the exception is the A to expand the modifiers). * Clicking anywhere on the empty space in a modifier's panel will make it active. These changes require some refactoring of object modifier code. First is splitting up the modifier property invoke callback, which now needs to be able to get the active modifier separately from the hovered modifier for the different operators. Second is a change to removing modifiers, where there is now a separate function to remove a modifier from an object's list, in order to handle changing the active. Finally, the panel handler needs a small tweak so that this "click in panel" event can be handled afterwards.
2020-12-02 13:35:07 +01:00
static void rna_Modifier_is_active_set(PointerRNA *ptr, bool value)
{
ModifierData *md = ptr->data;
if (value) {
/* Disable the active flag of all other modif-iers. */
for (ModifierData *prev_md = md->prev; prev_md != NULL; prev_md = prev_md->prev) {
prev_md->flag &= ~eModifierFlag_Active;
}
for (ModifierData *next_md = md->next; next_md != NULL; next_md = next_md->next) {
next_md->flag &= ~eModifierFlag_Active;
}
md->flag |= eModifierFlag_Active;
}
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* Vertex Groups */
# define RNA_MOD_VGROUP_NAME_SET(_type, _prop) \
static void rna_##_type##Modifier_##_prop##_set(PointerRNA *ptr, const char *value) \
{ \
_type##ModifierData *tmd = (_type##ModifierData *)ptr->data; \
rna_object_vgroup_name_set(ptr, value, tmd->_prop, sizeof(tmd->_prop)); \
}
RNA_MOD_VGROUP_NAME_SET(Armature, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Bevel, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Cast, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Curve, name);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_MOD_VGROUP_NAME_SET(DataTransfer, defgrp_name);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_VGROUP_NAME_SET(Decimate, defgrp_name);
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
RNA_MOD_VGROUP_NAME_SET(CorrectiveSmooth, defgrp_name);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_VGROUP_NAME_SET(Displace, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Hook, name);
RNA_MOD_VGROUP_NAME_SET(LaplacianDeform, anchor_grp_name);
RNA_MOD_VGROUP_NAME_SET(LaplacianSmooth, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Lattice, name);
RNA_MOD_VGROUP_NAME_SET(Mask, vgroup);
RNA_MOD_VGROUP_NAME_SET(MeshDeform, defgrp_name);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
RNA_MOD_VGROUP_NAME_SET(NormalEdit, defgrp_name);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_VGROUP_NAME_SET(Shrinkwrap, vgroup_name);
RNA_MOD_VGROUP_NAME_SET(SimpleDeform, vgroup_name);
RNA_MOD_VGROUP_NAME_SET(Smooth, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Solidify, defgrp_name);
Solidify modifier: add option to assign shell & rim geometry to selected vertex groups. This commit gives the solidify modifier the ability to assign the newly created shell and rim geometries to selected vertex groups. This expands the procedural control over the modifier stack by letting users apply modifiers to the shell geometry without affecting the original geometry. This will be especially helpful for NPR users that use solidify to create backface culling lines on their characters giving them the ability to add displace noise and other effects. Differential Revision: https://developer.blender.org/D6903
2020-03-27 10:56:14 +01:00
RNA_MOD_VGROUP_NAME_SET(Solidify, shell_defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Solidify, rim_defgrp_name);
Surface Deform modifier: add vertex group and strength control. This commit aims to add functionality to the surface deform modifier that gives more control and allows it to work better with the modifier stack. * Maintains compatibility with older files. The default settings keep it so that the whole object is bound and vertex coordinates get overwritten as the modifier currently does. * Turns the deformations from an absolute vertex coordinate overwrite into an additive offset from the vertex location before the modifier to the resulting bound deformation. This gives the ability to control the strength of the deformation and mix the deformation of the modifier with the modifier stack that comes before it. * Also adds in a vertex group with the invert option. This is applied after the bind deformation is added. So the whole object is still bound to target, and the vertex group filters afterwards what parts get affected. I experimented with a version to only binds the geometry weighted to the vertex group, but that would break compatibility with old files. I may bring it in later as a separate option/mode for the surface deform. With several fixes from @mont29. Reviewed By: mont29 Differencial Revision: https://developer.blender.org/D6894
2020-03-27 12:20:31 +01:00
RNA_MOD_VGROUP_NAME_SET(SurfaceDeform, defgrp_name);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_VGROUP_NAME_SET(UVWarp, vgroup_name);
RNA_MOD_VGROUP_NAME_SET(Warp, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Wave, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(WeightVGEdit, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(WeightVGEdit, mask_defgrp_name);
RNA_MOD_VGROUP_NAME_SET(WeightVGMix, defgrp_name_a);
RNA_MOD_VGROUP_NAME_SET(WeightVGMix, defgrp_name_b);
RNA_MOD_VGROUP_NAME_SET(WeightVGMix, mask_defgrp_name);
RNA_MOD_VGROUP_NAME_SET(WeightVGProximity, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(WeightVGProximity, mask_defgrp_name);
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
RNA_MOD_VGROUP_NAME_SET(WeightedNormal, defgrp_name);
Modifier: New Weld Modifier Part of T70240 This is the initial implementation of Weld Modifier. New features will be added later. ToDo: - Seams: restrict welding to vertices along boundary edges. - Edge Collapse: collapse edges below the length threshold. - New icon. - Some customdata are not being correctly interpolated. Differential Revision: https://developer.blender.org/D6383
2019-12-11 22:31:20 -03:00
RNA_MOD_VGROUP_NAME_SET(Weld, defgrp_name);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_VGROUP_NAME_SET(Wireframe, defgrp_name);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
static void rna_ExplodeModifier_vgroup_get(PointerRNA *ptr, char *value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
rna_object_vgroup_name_index_get(ptr, value, emd->vgroup);
}
static int rna_ExplodeModifier_vgroup_length(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
return rna_object_vgroup_name_index_length(ptr, emd->vgroup);
}
static void rna_ExplodeModifier_vgroup_set(PointerRNA *ptr, const char *value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ExplodeModifierData *emd = (ExplodeModifierData *)ptr->data;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
rna_object_vgroup_name_index_set(ptr, value, &emd->vgroup);
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
# undef RNA_MOD_VGROUP_NAME_SET
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* UV layers */
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
# define RNA_MOD_UVLAYER_NAME_SET(_type, _prop) \
static void rna_##_type##Modifier_##_prop##_set(PointerRNA *ptr, const char *value) \
{ \
_type##ModifierData *tmd = (_type##ModifierData *)ptr->data; \
rna_object_uvlayer_name_set(ptr, value, tmd->_prop, sizeof(tmd->_prop)); \
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_UVLAYER_NAME_SET(MappingInfo, uvlayer_name);
RNA_MOD_UVLAYER_NAME_SET(UVProject, uvlayer_name);
RNA_MOD_UVLAYER_NAME_SET(UVWarp, uvlayer_name);
RNA_MOD_UVLAYER_NAME_SET(WeightVGEdit, mask_tex_uvlayer_name);
RNA_MOD_UVLAYER_NAME_SET(WeightVGMix, mask_tex_uvlayer_name);
RNA_MOD_UVLAYER_NAME_SET(WeightVGProximity, mask_tex_uvlayer_name);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
# undef RNA_MOD_UVLAYER_NAME_SET
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* Objects */
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
static void modifier_object_set(Object *self, Object **ob_p, int type, PointerRNA value)
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
{
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
Object *ob = value.data;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
if (!self || ob != self) {
if (!ob || type == OB_EMPTY || ob->type == type) {
id_lib_extern((ID *)ob);
*ob_p = ob;
}
}
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
# define RNA_MOD_OBJECT_SET(_type, _prop, _obtype) \
Python: Raise an error even NO_MAIN data is assigned to object The goal is to prevent assignment of temporary or evaluated meshes to objects from the main database. Majority of the change is actually related on passing reports around. On a positive side there are more error prints which can become more visible to scripters. There are still possible further improvements in the related areas. For example, disable user counting for evaluated ID datablocks when assignment happens. But can also happen later on as a separate improvement. Reviewers: brecht, campbellbarton, mont29 Reviewed By: brecht Differential Revision: https://developer.blender.org/D4884
2019-05-17 13:59:59 +02:00
static void rna_##_type##Modifier_##_prop##_set( \
Cleanup: reorder report argument for pointer assignment Most code uses ReportList argument last (or at least not first) when an optional report list can be passed in.
2019-05-20 18:06:09 +10:00
PointerRNA *ptr, PointerRNA value, struct ReportList *UNUSED(reports)) \
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
{ \
_type##ModifierData *tmd = (_type##ModifierData *)ptr->data; \
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
modifier_object_set((Object *)ptr->owner_id, &tmd->_prop, _obtype, value); \
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_OBJECT_SET(Armature, object, OB_ARMATURE);
RNA_MOD_OBJECT_SET(Array, start_cap, OB_MESH);
RNA_MOD_OBJECT_SET(Array, end_cap, OB_MESH);
RNA_MOD_OBJECT_SET(Array, curve_ob, OB_CURVE);
RNA_MOD_OBJECT_SET(Boolean, object, OB_MESH);
RNA_MOD_OBJECT_SET(Cast, object, OB_EMPTY);
RNA_MOD_OBJECT_SET(Curve, object, OB_CURVE);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_MOD_OBJECT_SET(DataTransfer, ob_source, OB_MESH);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_OBJECT_SET(Lattice, object, OB_LATTICE);
RNA_MOD_OBJECT_SET(Mask, ob_arm, OB_ARMATURE);
RNA_MOD_OBJECT_SET(MeshDeform, object, OB_MESH);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
RNA_MOD_OBJECT_SET(NormalEdit, target, OB_EMPTY);
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_MOD_OBJECT_SET(Shrinkwrap, target, OB_MESH);
RNA_MOD_OBJECT_SET(Shrinkwrap, auxTarget, OB_MESH);
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
RNA_MOD_OBJECT_SET(SurfaceDeform, target, OB_MESH);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Cleanup: reorder report argument for pointer assignment Most code uses ReportList argument last (or at least not first) when an optional report list can be passed in.
2019-05-20 18:06:09 +10:00
static void rna_HookModifier_object_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *owner = (Object *)ptr->owner_id;
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
HookModifierData *hmd = ptr->data;
Fix for missing id_lib_extern, assigning ID's
2015-10-16 21:50:23 +11:00
Object *ob = (Object *)value.data;
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
Fix for missing id_lib_extern, assigning ID's
2015-10-16 21:50:23 +11:00
hmd->object = ob;
id_lib_extern((ID *)ob);
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
BKE_object_modifier_hook_reset(owner, hmd);
}
LibOverride: Fix broken Hook modifier case. Hook modifier uses same kind of parent inverse matrix as regular object parenting, so we need to bypass that matrix re-computation when setting the overridding object here as well. Also cleanup some minor glitches in object parents' override_apply func.
2019-08-27 16:28:41 +02:00
static bool rna_HookModifier_object_override_apply(Main *UNUSED(bmain),
PointerRNA *ptr_dst,
PointerRNA *ptr_src,
PointerRNA *ptr_storage,
PropertyRNA *prop_dst,
PropertyRNA *prop_src,
PropertyRNA *UNUSED(prop_storage),
const int len_dst,
const int len_src,
const int len_storage,
PointerRNA *UNUSED(ptr_item_dst),
PointerRNA *UNUSED(ptr_item_src),
PointerRNA *UNUSED(ptr_item_storage),
IDOverrideLibraryPropertyOperation *opop)
{
BLI_assert(len_dst == len_src && (!ptr_storage || len_dst == len_storage) && len_dst == 0);
BLI_assert(opop->operation == IDOVERRIDE_LIBRARY_OP_REPLACE &&
Cleanup: typo
2020-04-15 16:57:28 +02:00
"Unsupported RNA override operation on Hook modifier target object pointer");
LibOverride: Fix broken Hook modifier case. Hook modifier uses same kind of parent inverse matrix as regular object parenting, so we need to bypass that matrix re-computation when setting the overridding object here as well. Also cleanup some minor glitches in object parents' override_apply func.
2019-08-27 16:28:41 +02:00
UNUSED_VARS_NDEBUG(ptr_storage, len_dst, len_src, len_storage, opop);
/* We need a special handling here because setting hook target resets invert parent matrix,
* which is evil in our case. */
HookModifierData *hmd = ptr_dst->data;
Object *owner = (Object *)ptr_dst->owner_id;
Object *target_dst = RNA_property_pointer_get(ptr_dst, prop_dst).data;
Object *target_src = RNA_property_pointer_get(ptr_src, prop_src).data;
BLI_assert(target_dst == hmd->object);
if (target_src == target_dst) {
return false;
}
hmd->object = target_src;
if (target_src == NULL) {
/* The only case where we do want default behavior (with matrix reset). */
BKE_object_modifier_hook_reset(owner, hmd);
}
return true;
}
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
static void rna_HookModifier_subtarget_set(PointerRNA *ptr, const char *value)
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *owner = (Object *)ptr->owner_id;
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
HookModifierData *hmd = ptr->data;
BLI_strncpy(hmd->subtarget, value, sizeof(hmd->subtarget));
BKE_object_modifier_hook_reset(owner, hmd);
}
static int rna_HookModifier_vertex_indices_get_length(PointerRNA *ptr,
int length[RNA_MAX_ARRAY_DIMENSION])
{
HookModifierData *hmd = ptr->data;
int totindex = hmd->indexar ? hmd->totindex : 0;
return (length[0] = totindex);
}
static void rna_HookModifier_vertex_indices_get(PointerRNA *ptr, int *values)
{
HookModifierData *hmd = ptr->data;
if (hmd->indexar != NULL) {
memcpy(values, hmd->indexar, sizeof(int) * hmd->totindex);
}
}
static void rna_HookModifier_vertex_indices_set(HookModifierData *hmd,
ReportList *reports,
int indices_len,
int *indices)
{
if (indices_len == 0) {
MEM_SAFE_FREE(hmd->indexar);
hmd->totindex = 0;
}
else {
/* Reject negative indices. */
for (int i = 0; i < indices_len; i++) {
if (indices[i] < 0) {
BKE_reportf(reports, RPT_ERROR, "Negative vertex index in vertex_indices_set");
return;
}
}
/* Copy and sort the index array. */
size_t size = sizeof(int) * indices_len;
int *buffer = MEM_mallocN(size, "hook indexar");
memcpy(buffer, indices, size);
qsort(buffer, indices_len, sizeof(int), BLI_sortutil_cmp_int);
/* Reject duplicate indices. */
for (int i = 1; i < indices_len; i++) {
if (buffer[i] == buffer[i - 1]) {
BKE_reportf(reports, RPT_ERROR, "Duplicate index %d in vertex_indices_set", buffer[i]);
MEM_freeN(buffer);
return;
}
}
/* Success - save the new array. */
MEM_SAFE_FREE(hmd->indexar);
hmd->indexar = buffer;
hmd->totindex = indices_len;
}
add vertex group option to decimate modifier, handy if you want to pin some parts of the geometry.
2012-10-22 15:39:06 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
static PointerRNA rna_UVProjector_object_get(PointerRNA *ptr)
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
{
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
Object **ob = (Object **)ptr->data;
return rna_pointer_inherit_refine(ptr, &RNA_Object, *ob);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
Cleanup: reorder report argument for pointer assignment Most code uses ReportList argument last (or at least not first) when an optional report list can be passed in.
2019-05-20 18:06:09 +10:00
static void rna_UVProjector_object_set(PointerRNA *ptr,
PointerRNA value,
struct ReportList *UNUSED(reports))
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
{
Fix for missing id_lib_extern, assigning ID's
2015-10-16 21:50:23 +11:00
Object **ob_p = (Object **)ptr->data;
Object *ob = (Object *)value.data;
id_lib_extern((ID *)ob);
*ob_p = ob;
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
# undef RNA_MOD_OBJECT_SET
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* Other rna callbacks */
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
static void rna_fluid_set_type(Main *bmain, Scene *scene, PointerRNA *ptr)
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
{
Cleanup: Fluid renaming from old 'manta' naming to new 'fluid' naming Changed variable names from mmd, mds, mfs, and mes to fmd, fds, ffs, and fes. The author of this commits lights a candle for all the merge conflicts this will cause.
2020-07-03 11:51:15 +02:00
FluidModifierData *fmd = (FluidModifierData *)ptr->data;
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* nothing changed */
Cleanup: Fluid renaming from old 'manta' naming to new 'fluid' naming Changed variable names from mmd, mds, mfs, and mes to fmd, fds, ffs, and fes. The author of this commits lights a candle for all the merge conflicts this will cause.
2020-07-03 11:51:15 +02:00
if ((fmd->type & MOD_FLUID_TYPE_DOMAIN) && fmd->domain) {
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
return;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix linking errors WITH_MOD_FLUID=OFF
2019-12-17 08:38:08 +11:00
# ifdef WITH_FLUID
Cleanup: Fluid renaming from old 'manta' naming to new 'fluid' naming Changed variable names from mmd, mds, mfs, and mes to fmd, fds, ffs, and fes. The author of this commits lights a candle for all the merge conflicts this will cause.
2020-07-03 11:51:15 +02:00
BKE_fluid_modifier_free(fmd); /* XXX TODO: completely free all 3 pointers */
BKE_fluid_modifier_create_type_data(fmd); /* create regarding of selected type */
Fix linking errors WITH_MOD_FLUID=OFF
2019-12-17 08:38:08 +11:00
# endif
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Fluid renaming from old 'manta' naming to new 'fluid' naming Changed variable names from mmd, mds, mfs, and mes to fmd, fds, ffs, and fes. The author of this commits lights a candle for all the merge conflicts this will cause.
2020-07-03 11:51:15 +02:00
switch (fmd->type) {
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
case MOD_FLUID_TYPE_DOMAIN:
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
ob->dt = OB_WIRE;
break;
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
case MOD_FLUID_TYPE_FLOW:
case MOD_FLUID_TYPE_EFFEC:
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
case 0:
default:
break;
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
/* update dependency since a domain - other type switch could have happened */
rna_Modifier_dependency_update(bmain, scene, ptr);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. also set_source_files_properties() wasn't working for rna_*_gen.c files, set dna.c and generated data files with generated property too.
2013-09-20 06:35:28 +00:00
static void rna_MultiresModifier_level_range(
PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
MultiresModifierData *mmd = (MultiresModifierData *)ptr->data;
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
*min = 0;
code cleanup: use min/max functions rather then macros.
2012-11-07 12:31:05 +00:00
*max = max_ii(0, mmd->totlvl); /* intentionally _not_ -1 */
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
}
RNA: correct callback type Missed when changing callbacks from int to bool type.
2018-07-05 22:25:34 +02:00
static bool rna_MultiresModifier_external_get(PointerRNA *ptr)
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
Mesh *me = ob->data;
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
=bmesh= modifiers can now be applied with shapekeys
2011-04-15 05:20:18 +00:00
return CustomData_external_test(&me->ldata, CD_MDISPS);
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
}
rename some rna properties filename --> filepath * filename == "foo.ext" * filepath == "/path/to/and/including/foo.ext" this was alredy followed in some places not not everywhere.
2010-06-02 17:58:28 +00:00
static void rna_MultiresModifier_filepath_get(PointerRNA *ptr, char *value)
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external;
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
BLI_strncpy(value, (external) ? external->filename : "", sizeof(external->filename));
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
}
rename some rna properties filename --> filepath * filename == "foo.ext" * filepath == "/path/to/and/including/foo.ext" this was alredy followed in some places not not everywhere.
2010-06-02 17:58:28 +00:00
static void rna_MultiresModifier_filepath_set(PointerRNA *ptr, const char *value)
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external;
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage). Makes usage of those funcs much more clear, we even had mixed '!strcmp(foo, bar)' and 'strcmp(foo, bar) == 0' in several places...
2015-01-26 16:03:11 +01:00
if (external && !STREQ(external->filename, value)) {
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
BLI_strncpy(external->filename, value, sizeof(external->filename));
Fix #22239: external btx won't load.
2010-06-01 19:26:35 +00:00
multires_force_external_reload(ob);
}
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
}
rename some rna properties filename --> filepath * filename == "foo.ext" * filepath == "/path/to/and/including/foo.ext" this was alredy followed in some places not not everywhere.
2010-06-02 17:58:28 +00:00
static int rna_MultiresModifier_filepath_length(PointerRNA *ptr)
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external;
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
return strlen((external) ? external->filename : "");
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
}
change shrinkwrap modifier cull front/back options from 2 booleans into an enum since it makes no sense to have front and back enabled at once.
2011-02-19 09:53:38 +00:00
static int rna_ShrinkwrapModifier_face_cull_get(PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ShrinkwrapModifierData *swm = (ShrinkwrapModifierData *)ptr->data;
Shrinkwrap Constraint: implement projection features from the modifier. Allow raycasting in two directions and culling front or back faces. Also implement a new Invert Cull option in both constraint and modifier that can be used to aim for faces aligned with the project axis direction when raycasting both ways. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3737
2018-07-08 13:47:26 +03:00
return swm->shrinkOpts & MOD_SHRINKWRAP_CULL_TARGET_MASK;
change shrinkwrap modifier cull front/back options from 2 booleans into an enum since it makes no sense to have front and back enabled at once.
2011-02-19 09:53:38 +00:00
}
static void rna_ShrinkwrapModifier_face_cull_set(struct PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
ShrinkwrapModifierData *swm = (ShrinkwrapModifierData *)ptr->data;
Shrinkwrap Constraint: implement projection features from the modifier. Allow raycasting in two directions and culling front or back faces. Also implement a new Invert Cull option in both constraint and modifier that can be used to aim for faces aligned with the project axis direction when raycasting both ways. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3737
2018-07-08 13:47:26 +03:00
swm->shrinkOpts = (swm->shrinkOpts & ~MOD_SHRINKWRAP_CULL_TARGET_MASK) | value;
change shrinkwrap modifier cull front/back options from 2 booleans into an enum since it makes no sense to have front and back enabled at once.
2011-02-19 09:53:38 +00:00
}
RNA: correct callback type Missed when changing callbacks from int to bool type.
2018-07-05 22:25:34 +02:00
static bool rna_MeshDeformModifier_is_bound_get(PointerRNA *ptr)
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
return (((MeshDeformModifierData *)ptr->data)->bindcagecos != NULL);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
}
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
static PointerRNA rna_SoftBodyModifier_settings_get(PointerRNA *ptr)
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_SoftBodySettings, ob->soft);
}
Softbody now uses the new pointcache code. Note: Rna access to softbody point cache is through softbody modifier although the point cache is in softbody settings. This is to make it similar to cloth. Bugfix: Softbody rna was trying to get "ob->soft->softflag" instead of the correct "ob->softflag".
2009-08-02 19:39:33 +00:00
static PointerRNA rna_SoftBodyModifier_point_cache_get(PointerRNA *ptr)
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
SoftBody: share point cache between CoW copies This is the same approach as 98a0bcd4252e952fa5438e9d1b69b0204f8a8746 applied to soft body simulation. In short, CoW copies share the point cache, and treat it as read-only except when the depsgraph is active.
2018-07-04 11:22:15 +02:00
return rna_pointer_inherit_refine(ptr, &RNA_PointCache, ob->soft->shared->pointcache);
Softbody now uses the new pointcache code. Note: Rna access to softbody point cache is through softbody modifier although the point cache is in softbody settings. This is to make it similar to cloth. Bugfix: Softbody rna was trying to get "ob->soft->softflag" instead of the correct "ob->softflag".
2009-08-02 19:39:33 +00:00
}
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
static PointerRNA rna_CollisionModifier_settings_get(PointerRNA *ptr)
{
RNA: Cleanup PointerRNA struct The old layout of `PointerRNA` was confusing for historic reasons: ``` typedef struct PointerRNA { struct { void *data; } id; struct StructRNA *type; void *data; } PointerRNA; ``` This patch updates it to: ``` typedef struct PointerRNA { struct ID *owner_id; struct StructRNA *type; void *data; } PointerRNA; ``` Throughout the code base `id.data` was replaced with `owner_id`. Furthermore, many explicit pointer type casts were added which were implicit before. Some type casts to `ID *` were removed. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D5558
2019-08-23 09:52:12 +02:00
Object *ob = (Object *)ptr->owner_id;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
return rna_pointer_inherit_refine(ptr, &RNA_CollisionSettings, ob->pd);
}
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
/* Special update function for setting the number of segments of the modifier that also resamples
* the segments in the custom profile. */
static void rna_BevelModifier_update_segments(Main *bmain, Scene *scene, PointerRNA *ptr)
{
BevelModifierData *bmd = (BevelModifierData *)ptr->data;
Bevel: Refactor profile type input to use an enum This will allow the easier addition of a constant radius mode in the future and some changes in the UI to mirror the recent similar change from "Only Vertices" to the "Affect" enum.
2020-06-22 22:25:55 -04:00
if (RNA_enum_get(ptr, "profile_type") == MOD_BEVEL_PROFILE_CUSTOM) {
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
short segments = (short)RNA_int_get(ptr, "segments");
Cleanup: use term init instead of initialize/initialise The abbreviation 'init' is brief, unambiguous and already used in thousands of places, also initialize is often accidentally written with British spelling.
2020-08-01 13:02:21 +10:00
BKE_curveprofile_init(bmd->custom_profile, segments);
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
}
rna_Modifier_update(bmain, scene, ptr);
}
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
static void rna_UVProjectModifier_num_projectors_set(PointerRNA *ptr, int value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
UVProjectModifierData *md = (UVProjectModifierData *)ptr->data;
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
int a;
Cleanup! Also fixed a nasty (but inofensive for now) stuff, we had both MOD_UVPROJECT_MAX and MOD_UVPROJECT_MAXPROJECTORS (the former used in RNA code, the later in modifier code)! Kept MOD_UVPROJECT_MAXPROJECTORS.
2013-09-01 21:49:35 +00:00
md->num_projectors = CLAMPIS(value, 1, MOD_UVPROJECT_MAXPROJECTORS);
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
for (a = md->num_projectors; a < MOD_UVPROJECT_MAXPROJECTORS; a++) {
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
md->projectors[a] = NULL;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
}
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
}
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
static void rna_OceanModifier_init_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
OceanModifierData *omd = (OceanModifierData *)ptr->data;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Ocean Modifier: refactored the delayed-refresh approach The approach of setting 'refresh' flags on the modifier, and performing the associated actions when the modifier is being evaluated, is a bad one. Instead, we use the separation of the original and the evaluated copy to 'refresh' certain things (because they simply aren't set at all on the original). Other actions are now done directly with BKE_ocean_xxx functions on the original data, intead of during evaluation.
2018-07-05 16:23:35 +02:00
BKE_ocean_free_modifier_cache(omd);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
rna_Modifier_update(bmain, scene, ptr);
}
static void rna_OceanModifier_ocean_chop_set(PointerRNA *ptr, float value)
{
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
OceanModifierData *omd = (OceanModifierData *)ptr->data;
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
float old_value = omd->chop_amount;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
omd->chop_amount = value;
Cleanup: trailing space in RNA
2018-06-09 14:40:09 +02:00
new math utility function isect_plane_plane_v3
2011-11-13 16:28:52 +00:00
if ((old_value == 0.0f && value > 0.0f) || (old_value > 0.0f && value == 0.0f)) {
Ocean Modifier: refactored the delayed-refresh approach The approach of setting 'refresh' flags on the modifier, and performing the associated actions when the modifier is being evaluated, is a bad one. Instead, we use the separation of the original and the evaluated copy to 'refresh' certain things (because they simply aren't set at all on the original). Other actions are now done directly with BKE_ocean_xxx functions on the original data, intead of during evaluation.
2018-07-05 16:23:35 +02:00
BKE_ocean_free_modifier_cache(omd);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
}
}
RNA: correct callback type Missed when changing callbacks from int to bool type.
2018-07-05 22:25:34 +02:00
static bool rna_LaplacianDeformModifier_is_bind_get(PointerRNA *ptr)
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
{
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)ptr->data;
Fix (unreported, related to T58210) LaplacianDeform binding state incorrectly reported by RNA. LaplacianDeform binding handling is a catastrophee in CoW context, because half of the binding (the laplacian solver cache thingy) is not saved, and can be re-generated on the fly from stored vcos. This means that binding is not only done when hitting 'bind' button, but also at file load, and when some things change. And this utterly breaks with CoW design, not sure how to fix, will add a task about that. But this also means that NULL laplacian solver cache pointer is not a good check to know whether it is binded or not, only stored vcos are relevant for that (and the binding flag, of course).
2018-12-05 18:37:29 +01:00
return ((lmd->flag & MOD_LAPLACIANDEFORM_BIND) && (lmd->vertexco != NULL));
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
}
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
/* NOTE: Curve and array modifiers requires curve path to be evaluated,
* dependency graph will make sure that curve eval would create such a path,
* but if curve was already evaluated we might miss path.
*
* So what we do here is: if path was not calculated for target curve we
* tag it for update.
*/
static void rna_CurveModifier_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
CurveModifierData *cmd = (CurveModifierData *)ptr->data;
rna_Modifier_update(bmain, scene, ptr);
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
if (cmd->object != NULL) {
Curve *curve = cmd->object->data;
if ((curve->flag & CU_PATH) == 0) {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&curve->id, ID_RECALC_GEOMETRY);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
}
}
}
static void rna_ArrayModifier_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
ArrayModifierData *amd = (ArrayModifierData *)ptr->data;
rna_Modifier_update(bmain, scene, ptr);
Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h This removes BKE_depsgraph.h and depsgraph.c
2017-06-08 10:14:53 +02:00
DEG_relations_tag_update(bmain);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
if (amd->curve_ob != NULL) {
Curve *curve = amd->curve_ob->data;
if ((curve->flag & CU_PATH) == 0) {
Depsgraph: Remove duplicated sets of recalc/update flags There were at least three copies of those: - OB_RECALC* family of flags, which are rudiment of an old dependency graph system. - PSYS_RECALC* which were used by old dependency graph system as a separate set since the graph itself did not handle particle systems. - DEG_TAG_* which was used to tag IDs. Now there is a single set, which defines what can be tagged and queried for an update. It also has some aggregate flags to make queries simpler. Lets once and for all solve the madness of those flags, stick to a single set, which will not overlap with anything or require any extra conversion. Technically, shouldn't be measurable user difference, but some of the agregate flags for few dependency graph components did change. Fixes T58632: Particle don't update rotation settings
2018-12-06 17:52:37 +01:00
DEG_id_tag_update(&curve->id, ID_RECALC_GEOMETRY);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
}
}
}
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
static void rna_DataTransferModifier_use_data_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (!(dtmd->flags & MOD_DATATRANSFER_USE_VERT)) {
dtmd->data_types &= ~DT_TYPE_VERT_ALL;
}
if (!(dtmd->flags & MOD_DATATRANSFER_USE_EDGE)) {
dtmd->data_types &= ~DT_TYPE_EDGE_ALL;
}
if (!(dtmd->flags & MOD_DATATRANSFER_USE_LOOP)) {
dtmd->data_types &= ~DT_TYPE_LOOP_ALL;
}
if (!(dtmd->flags & MOD_DATATRANSFER_USE_POLY)) {
dtmd->data_types &= ~DT_TYPE_POLY_ALL;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Add proper API functions for CustomDataMask dependencies. There were a few copies of the same few lines in depsgraph build code, so it seems to be logical to introduce a function for it, and make it accessible from C code for completeness. As an example, register the mask needs of the Data Transfer modifier.
2018-10-14 19:59:27 +03:00
rna_Modifier_dependency_update(bmain, scene, ptr);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
static void rna_DataTransferModifier_data_types_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
const int item_types = BKE_object_data_transfer_get_dttypes_item_types(dtmd->data_types);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (item_types & ME_VERT) {
dtmd->flags |= MOD_DATATRANSFER_USE_VERT;
}
if (item_types & ME_EDGE) {
dtmd->flags |= MOD_DATATRANSFER_USE_EDGE;
}
if (item_types & ME_LOOP) {
dtmd->flags |= MOD_DATATRANSFER_USE_LOOP;
}
if (item_types & ME_POLY) {
dtmd->flags |= MOD_DATATRANSFER_USE_POLY;
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Depsgraph: Add proper API functions for CustomDataMask dependencies. There were a few copies of the same few lines in depsgraph build code, so it seems to be logical to introduce a function for it, and make it accessible from C code for completeness. As an example, register the mask needs of the Data Transfer modifier.
2018-10-14 19:59:27 +03:00
rna_Modifier_dependency_update(bmain, scene, ptr);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
static void rna_DataTransferModifier_verts_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_VERT_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_edges_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_EDGE_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_loops_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_LOOP_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_polys_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_POLY_ALL;
dtmd->data_types |= value;
}
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem *rna_DataTransferModifier_layers_select_src_itemf(bContext *C,
PointerRNA *ptr,
PropertyRNA *prop,
bool *r_free)
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
EnumPropertyItem *item = NULL, tmp_item = {0};
int totitem = 0;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (!C) { /* needed for docs and i18n tools */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
return rna_enum_dt_layers_select_src_items;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* No active here! */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_ALL_SRC);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (STREQ(RNA_property_identifier(prop), "layers_vgroup_select_src")) {
Object *ob_src = dtmd->ob_source;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
# if 0 /* XXX Don't think we want this in modifier version... */
if (BKE_object_pose_armature_get(ob_src)) {
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_SELECT);
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_DEFORM);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
# endif
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_src) {
bDeformGroup *dg;
int i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
for (i = 0, dg = ob_src->defbase.first; dg; i++, dg = dg->next) {
tmp_item.value = i;
tmp_item.identifier = tmp_item.name = dg->name;
RNA_enum_item_add(&item, &totitem, &tmp_item);
}
}
}
else if (STREQ(RNA_property_identifier(prop), "layers_shapekey_select_src")) {
/* TODO */
}
else if (STREQ(RNA_property_identifier(prop), "layers_uv_select_src")) {
Object *ob_src = dtmd->ob_source;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_src) {
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
Mesh *me_eval;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
int num_data, i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Data Transfer Modifier: fix mesh_get_eval_final usage. It can't be used during modifier evaluation, and rna enum code should access the evaluated objects.
2018-12-03 16:56:11 +03:00
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor CDData masks, to have one mask per mesh elem type. We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407
2019-03-07 11:13:40 +01:00
CustomData_MeshMasks cddata_masks = CD_MASK_BAREMESH;
cddata_masks.lmask |= CD_MASK_MLOOPUV;
me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks);
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPUV);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
for (i = 0; i < num_data; i++) {
tmp_item.value = i;
tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(
&me_eval->ldata, CD_MLOOPUV, i);
RNA_enum_item_add(&item, &totitem, &tmp_item);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
}
}
else if (STREQ(RNA_property_identifier(prop), "layers_vcol_select_src")) {
Object *ob_src = dtmd->ob_source;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_src) {
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
Mesh *me_eval;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
int num_data, i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor access to dependency graph This change ensures that operators which needs access to evaluated data first makes sure there is a dependency graph. Other accesses to the dependency graph made it more explicit about whether they just need a valid dependency graph pointer or whether they expect the graph to be already evaluated. This replaces OPTYPE_USE_EVAL_DATA which is now removed. Some general rules about usage of accessors: - Drawing is expected to happen from a fully evaluated dependency graph. There is now a function to access it, which will in the future control that dependency graph is actually evaluated. This check is not yet done because there are some things to be taken care about first: for example, post-update hooks might leave scene in a state where something is still tagged for update. - All operators which needs to access evaluated state must use CTX_data_ensure_evaluated_depsgraph(). This function replaces OPTYPE_USE_EVAL_DATA. The call is generally to be done in the very beginning of the operator, prior other logic (unless this is some comprehensive operator which might or might not need access to an evaluated state). This call is never to be used from a loop. If some utility function requires evaluated state of dependency graph the graph is to be passed as an explicit argument. This way it is clear that no evaluation happens in a loop or something like this. - All cases which needs to know dependency graph pointer, but which doesn't want to actually evaluate it can use old-style function CTX_data_depsgraph_pointer(), assuming that underlying code will ensure dependency graph is evaluated prior to accessing it. - The new functions are replacing OPTYPE_USE_EVAL_DATA, so now it is explicit and local about where dependency graph is being ensured. This commit also contains some fixes of wrong usage of evaluation functions on original objects. Ideally should be split out, but in reality with all the APIs being renamed is quite tricky. Fixes T67454: Blender crash on rapid undo and select Speculation here is that sometimes undo and selection operators are sometimes handled in the same event loop iteration, which leaves non-evaluated dependency graph. Fixes T67973: Crash on Fix Deforms operator Fixes T67902: Crash when undo a loop cut Reviewers: brecht Reviewed By: brecht Subscribers: lichtwerk Maniphest Tasks: T67454 Differential Revision: https://developer.blender.org/D5343
2019-07-25 16:36:22 +02:00
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Data Transfer Modifier: fix mesh_get_eval_final usage. It can't be used during modifier evaluation, and rna enum code should access the evaluated objects.
2018-12-03 16:56:11 +03:00
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Refactor CDData masks, to have one mask per mesh elem type. We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407
2019-03-07 11:13:40 +01:00
CustomData_MeshMasks cddata_masks = CD_MASK_BAREMESH;
cddata_masks.lmask |= CD_MASK_MLOOPCOL;
me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks);
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPCOL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: remove last DM usages from datatransfer code.
2018-06-20 14:50:05 +02:00
for (i = 0; i < num_data; i++) {
tmp_item.value = i;
tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(
&me_eval->ldata, CD_MLOOPCOL, i);
RNA_enum_item_add(&item, &totitem, &tmp_item);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_end(&item, &totitem);
*r_free = true;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
return item;
}
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem *rna_DataTransferModifier_layers_select_dst_itemf(bContext *C,
PointerRNA *ptr,
PropertyRNA *prop,
bool *r_free)
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
EnumPropertyItem *item = NULL, tmp_item = {0};
int totitem = 0;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (!C) { /* needed for docs and i18n tools */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
return rna_enum_dt_layers_select_dst_items;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* No active here! */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_layers_select_dst_items, DT_LAYERS_NAME_DST);
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_layers_select_dst_items, DT_LAYERS_INDEX_DST);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (STREQ(RNA_property_identifier(prop), "layers_vgroup_select_dst")) {
/* Only list destination layers if we have a single source! */
if (dtmd->layers_select_src[DT_MULTILAYER_INDEX_MDEFORMVERT] >= 0) {
Object *ob_dst = CTX_data_active_object(C); /* XXX Is this OK? */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_dst) {
bDeformGroup *dg;
int i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
for (i = 0, dg = ob_dst->defbase.first; dg; i++, dg = dg->next) {
tmp_item.value = i;
tmp_item.identifier = tmp_item.name = dg->name;
RNA_enum_item_add(&item, &totitem, &tmp_item);
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
}
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
else if (STREQ(RNA_property_identifier(prop), "layers_shapekey_select_dst")) {
/* TODO */
}
else if (STREQ(RNA_property_identifier(prop), "layers_uv_select_dst")) {
/* Only list destination layers if we have a single source! */
if (dtmd->layers_select_src[DT_MULTILAYER_INDEX_UV] >= 0) {
Object *ob_dst = CTX_data_active_object(C); /* XXX Is this OK? */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_dst && ob_dst->data) {
Mesh *me_dst;
TexFace removal part 3 - MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-25 15:11:00 +10:00
CustomData *ldata;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
int num_data, i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
me_dst = ob_dst->data;
TexFace removal part 3 - MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-25 15:11:00 +10:00
ldata = &me_dst->ldata;
num_data = CustomData_number_of_layers(ldata, CD_MLOOPUV);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
for (i = 0; i < num_data; i++) {
tmp_item.value = i;
TexFace removal part 3 - MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-25 15:11:00 +10:00
tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(ldata, CD_MLOOPUV, i);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_add(&item, &totitem, &tmp_item);
}
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
else if (STREQ(RNA_property_identifier(prop), "layers_vcol_select_dst")) {
/* Only list destination layers if we have a single source! */
if (dtmd->layers_select_src[DT_MULTILAYER_INDEX_VCOL] >= 0) {
Object *ob_dst = CTX_data_active_object(C); /* XXX Is this OK? */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
if (ob_dst && ob_dst->data) {
Mesh *me_dst;
CustomData *ldata;
int num_data, i;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
me_dst = ob_dst->data;
ldata = &me_dst->ldata;
num_data = CustomData_number_of_layers(ldata, CD_MLOOPCOL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_add_separator(&item, &totitem);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
for (i = 0; i < num_data; i++) {
tmp_item.value = i;
tmp_item.identifier = tmp_item.name = CustomData_get_layer_name(ldata, CD_MLOOPCOL, i);
RNA_enum_item_add(&item, &totitem, &tmp_item);
}
}
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
}
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_enum_item_end(&item, &totitem);
*r_free = true;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
return item;
}
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem *rna_DataTransferModifier_mix_mode_itemf(bContext *C,
PointerRNA *ptr,
PropertyRNA *UNUSED(prop),
bool *r_free)
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
EnumPropertyItem *item = NULL;
int totitem = 0;
bool support_advanced_mixing, support_threshold;
if (!C) { /* needed for docs and i18n tools */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
return rna_enum_dt_mix_mode_items;
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_TRANSFER);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
BKE_object_data_transfer_get_dttypes_capacity(
dtmd->data_types, &support_advanced_mixing, &support_threshold);
Transfer Data: resurrect fake AND/OR when transferring 'boolean' values like UVSeam, Freestyle marks, etc.
2015-01-14 10:51:41 +01:00
if (support_threshold) {
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_REPLACE_ABOVE_THRESHOLD);
RNA_enum_items_add_value(
&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_REPLACE_BELOW_THRESHOLD);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
if (support_advanced_mixing) {
RNA_enum_item_add_separator(&item, &totitem);
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_MIX);
RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_ADD);
RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_SUB);
RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_mix_mode_items, CDT_MIX_MUL);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
RNA_enum_item_end(&item, &totitem);
*r_free = true;
return item;
}
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
static void rna_CorrectiveSmoothModifier_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
Fix T69542: Corrective Smooth modifier breaks when drivers are involved Previously the cache for the modifier would not be invalidated if modifier settings were changed with drivers or keyframes. Now we compare the current setting with the ones used to generate the cache and invalidate the cache if they differ. Reviewed By: Sybren Differential Revision: http://developer.blender.org/D5694
2019-09-25 16:45:05 +02:00
MEM_SAFE_FREE(csmd->delta_cache.deltas);
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
rna_Modifier_update(bmain, scene, ptr);
}
static void rna_CorrectiveSmoothModifier_rest_source_update(Main *bmain,
Scene *scene,
PointerRNA *ptr)
{
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
if (csmd->rest_source != MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND) {
MEM_SAFE_FREE(csmd->bind_coords);
csmd->bind_coords_num = 0;
}
rna_CorrectiveSmoothModifier_update(bmain, scene, ptr);
}
RNA: correct callback type Missed when changing callbacks from int to bool type.
2018-07-05 22:25:34 +02:00
static bool rna_CorrectiveSmoothModifier_is_bind_get(PointerRNA *ptr)
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
{
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)ptr->data;
return (csmd->bind_coords != NULL);
}
RNA: correct callback type Missed when changing callbacks from int to bool type.
2018-07-05 22:25:34 +02:00
static bool rna_SurfaceDeformModifier_is_bound_get(PointerRNA *ptr)
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
{
return (((SurfaceDeformModifierData *)ptr->data)->verts != NULL);
}
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
static bool rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr,
const PointerRNA value)
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
{
ParticleInstanceModifierData *psmd = ptr->data;
ParticleSystem *psys = value.data;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
if (!psmd->ob) {
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
return false;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
}
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
/* make sure psys is in the object */
Cleanup: use bool for poll functions
2018-07-02 11:47:00 +02:00
return BLI_findindex(&psmd->ob->particlesystem, psys) != -1;
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
}
static PointerRNA rna_ParticleInstanceModifier_particle_system_get(PointerRNA *ptr)
{
ParticleInstanceModifierData *psmd = ptr->data;
ParticleSystem *psys;
PointerRNA rptr;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
if (!psmd->ob) {
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
return PointerRNA_NULL;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
}
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
psys = BLI_findlink(&psmd->ob->particlesystem, psmd->psys - 1);
RNA_pointer_create((ID *)psmd->ob, &RNA_ParticleSystem, psys, &rptr);
return rptr;
}
Cleanup: reorder report argument for pointer assignment Most code uses ReportList argument last (or at least not first) when an optional report list can be passed in.
2019-05-20 18:06:09 +10:00
static void rna_ParticleInstanceModifier_particle_system_set(PointerRNA *ptr,
const PointerRNA value,
struct ReportList *UNUSED(reports))
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
{
ParticleInstanceModifierData *psmd = ptr->data;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
if (!psmd->ob) {
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
return;
Cleanup: style, use braces in RNA
2019-06-04 00:21:57 +10:00
}
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
psmd->psys = BLI_findindex(&psmd->ob->particlesystem, value.data) + 1;
CLAMP_MIN(psmd->psys, 1);
}
UI: Only set first bit of modifier expansion fag with Python Only the flag for the top level panels is exposed with RNA, so this adds a set method to only change that bit.
2020-06-10 11:08:58 -04:00
/**
* Special set callback that just changes the first bit of the expansion flag.
Cleanup: spelling
2020-06-25 23:13:02 +10:00
* This way the expansion state of all the sub-panels is not changed by RNA.
UI: Only set first bit of modifier expansion fag with Python Only the flag for the top level panels is exposed with RNA, so this adds a set method to only change that bit.
2020-06-10 11:08:58 -04:00
*/
static void rna_Modifier_show_expanded_set(PointerRNA *ptr, bool value)
{
ModifierData *md = ptr->data;
Cleanup: Use an enum to set instanced panel expansion This commit uses an enum to access expansion for specific panels for each modifier, constraint, etc. Even though these values are quite simple, this can help make the code more explicit when the ui_expand_flag is accessed directly. Also update comments about this bitfield to make them consistent.
2020-10-29 19:34:29 -05:00
SET_FLAG_FROM_TEST(md->ui_expand_flag, value, UI_PANEL_DATA_EXPAND_ROOT);
UI: Only set first bit of modifier expansion fag with Python Only the flag for the top level panels is exposed with RNA, so this adds a set method to only change that bit.
2020-06-10 11:08:58 -04:00
}
Fix T78902: Only check main modifier panel for expansion property Internally the "show_expanded" property stores the expansion for every subpanel, but for RNA we should only check the first bit of the flag that corresponds to the main panel.
2020-07-13 20:10:49 -04:00
/**
* Only check the first bit of the expansion flag for the main panel's expansion,
* maintaining compatibility with older versions where there was only one expansion
* value.
*/
static bool rna_Modifier_show_expanded_get(PointerRNA *ptr)
{
ModifierData *md = ptr->data;
Cleanup: Use an enum to set instanced panel expansion This commit uses an enum to access expansion for specific panels for each modifier, constraint, etc. Even though these values are quite simple, this can help make the code more explicit when the ui_expand_flag is accessed directly. Also update comments about this bitfield to make them consistent.
2020-10-29 19:34:29 -05:00
return md->ui_expand_flag & UI_PANEL_DATA_EXPAND_ROOT;
Fix T78902: Only check main modifier panel for expansion property Internally the "show_expanded" property stores the expansion for every subpanel, but for RNA we should only check the first bit of the flag that corresponds to the main panel.
2020-07-13 20:10:49 -04:00
}
Cycles: add support for rendering deformation motion blur from Alembic caches. This patch adds the ability to render motion blur from Alembic caches. The motion blur data is derived from a velocity attribute whose name has to be defined by the user through the MeshSequenceCache modifier, with a default value of ".velocities", which is the standard name in Alembic for the velocity property, although other software may ignore it and write velocity with their own naming convention (e.g. "v" in Houdini). Furthermore, a property was added to define how the velocity vectors are interpreted with regard to time : frame or second. "Frame" means that the velocity is already scaled by the time step and we do not need to modify it for it to look proper. "Second" means that the unit the velocity was measured in is in seconds and so has to be scaled by some time step computed here as being the time between two frames (1 / FPS, which would be typical for a simulation). This appears to be common, and is the default behavior. Another property was added to control the scale of the velocity to further modify the look of the motion blur. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D2388
2020-08-03 03:28:04 +02:00
static int rna_MeshSequenceCacheModifier_has_velocity_get(PointerRNA *ptr)
{
# ifdef WITH_ALEMBIC
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)ptr->data;
return ABC_has_vec3_array_property_named(mcmd->reader, mcmd->cache_file->velocity_name);
# else
return false;
UNUSED_VARS(ptr);
# endif
}
static int rna_MeshSequenceCacheModifier_read_velocity_get(PointerRNA *ptr)
{
# ifdef WITH_ALEMBIC
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)ptr->data;
if (mcmd->num_vertices == 0) {
return 0;
}
if (mcmd->vertex_velocities) {
MEM_freeN(mcmd->vertex_velocities);
}
mcmd->vertex_velocities = MEM_mallocN(sizeof(MeshCacheVertexVelocity) * mcmd->num_vertices,
"Mesh Cache Velocities");
int num_read = ABC_read_velocity_cache(mcmd->reader,
mcmd->cache_file->velocity_name,
mcmd->last_lookup_time,
mcmd->velocity_scale * mcmd->velocity_delta,
mcmd->num_vertices,
(float *)mcmd->vertex_velocities);
if (num_read == -1 || num_read != mcmd->num_vertices) {
return false;
}
return true;
# else
return false;
UNUSED_VARS(ptr);
# endif
}
Fix T83673: Custom node trees selectable in nodes modifier Node tree types from addons were selectable in the modifier's drop-down. Obviously they didn't do anything, but it shouldn't be possible anyway. This was just caused by an unimplemented poll function.
2020-12-13 22:59:52 -06:00
static bool rna_NodesModifier_node_group_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
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
{
bNodeTree *ntree = value.data;
Fix T83673: Custom node trees selectable in nodes modifier Node tree types from addons were selectable in the modifier's drop-down. Obviously they didn't do anything, but it shouldn't be possible anyway. This was just caused by an unimplemented poll function.
2020-12-13 22:59:52 -06:00
return ntree->type == NTREE_GEOMETRY;
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
}
static void rna_NodesModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Object *object = (Object *)ptr->owner_id;
NodesModifierData *nmd = ptr->data;
rna_Modifier_dependency_update(bmain, scene, ptr);
MOD_nodes_update_interface(object, nmd);
}
static IDProperty *rna_NodesModifierSettings_properties(PointerRNA *ptr, bool create)
{
NodesModifierSettings *settings = ptr->data;
if (create && settings->properties == NULL) {
IDPropertyTemplate val = {0};
settings->properties = IDP_New(IDP_GROUP, &val, "Nodes Modifier Settings");
}
return settings->properties;
}
static char *rna_NodesModifierSettings_path(PointerRNA *UNUSED(ptr))
{
return BLI_strdup("settings");
}
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
#else
Multires: Remove simple subdivision type The simple subdivision as a type only causes issues like no-continuous normals across edges, inability to reliably switch the type and things like this. The new subdivision operators supports wider variety of how to add details to the model, which are more powerful than a single one-time decision on the subdivision type. The versioning code is adjusting topology converter to specify all edges as infinitely sharp. The reason for this (instead of using settings.is_simple) is because in a longer term the simple subdivision will be removed from Subsurf modifier as well, and will be replaced with more efficient bmesh-based modifier. This is finished up version of D8436. Differential Revision: https://developer.blender.org/D9350
2020-10-26 12:32:22 +01:00
static void rna_def_property_subdivision_common(StructRNA *srna)
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
{
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
static const EnumPropertyItem prop_uv_smooth_items[] = {
Subdivision Surfaces: make uv smooth items consistent with new boundary smooth This adds an option to smooth UV boundaries including corners, and renames the available options to None / Keep Corners / All. Ref D8413
2020-09-30 17:19:12 +02:00
{SUBSURF_UV_SMOOTH_NONE, "NONE", 0, "None", "UVs are not smoothed, boundaries are kept sharp"},
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
{SUBSURF_UV_SMOOTH_PRESERVE_CORNERS,
"PRESERVE_CORNERS",
0,
Subdivision Surfaces: make uv smooth items consistent with new boundary smooth This adds an option to smooth UV boundaries including corners, and renames the available options to None / Keep Corners / All. Ref D8413
2020-09-30 17:19:12 +02:00
"Keep Corners",
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
"UVs are smoothed, corners on discontinuous boundary are kept sharp"},
# if 0
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
{SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_AND_JUNCTIONS,
"PRESERVE_CORNERS_AND_JUNCTIONS",
0,
"Smooth, keep corners+junctions",
"UVs are smoothed, corners on discontinuous boundary and "
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
"junctions of 3 or more regions are kept sharp"},
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
{SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE,
"PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE",
0,
"Smooth, keep corners+junctions+concave",
"UVs are smoothed, corners on discontinuous boundary, "
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
"junctions of 3 or more regions and darts and concave corners are kept sharp"},
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
{SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES,
"PRESERVE_BOUNDARIES",
0,
"Smooth, keep corners",
"UVs are smoothed, boundaries are kept sharp"},
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
# endif
Subdivision Surfaces: make uv smooth items consistent with new boundary smooth This adds an option to smooth UV boundaries including corners, and renames the available options to None / Keep Corners / All. Ref D8413
2020-09-30 17:19:12 +02:00
{SUBSURF_UV_SMOOTH_ALL, "PRESERVE_BOUNDARIES", 0, "All", "UVs and boundaries are smoothed"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Subsurf: Make uv boundaries easily extendible This replaces old single toggle option to subdivide UVs with an enum which can have more options. The usecase for this is to be compatible with other software. But we also might choose different subdivision type as default in the future. DNA and underlying code supports all possible options, but only the ones which are compatible with old subdivision code are currently exposes. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3575
2018-08-02 13:36:22 +02:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Subdivision Surfaces: add boundary smooth option to modifiers This adds the option to either smooth the entire boundary, or to keep corners sharp, for the Subdivision Surface and Multiresolution modifiers. This mainly helps with compatibility with other software. The default behavior remains to smooth the entire boundary. Differential Revision: https://developer.blender.org/D8485
2020-09-30 15:56:37 +02:00
static const EnumPropertyItem prop_boundary_smooth_items[] = {
{SUBSURF_BOUNDARY_SMOOTH_PRESERVE_CORNERS,
"PRESERVE_CORNERS",
0,
"Keep Corners",
"Smooth boundaries, but corners are kept sharp"},
{SUBSURF_BOUNDARY_SMOOTH_ALL, "ALL", 0, "All", "Smooth boundaries, including corners"},
{0, NULL, 0, NULL, NULL},
};
Multires: Synchronize settings with Subsurf modifier Currently no functional changes, just exposes all settings which we need for OpenSubdiv, similar to what Subsurf modifier is doing already. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3602
2018-08-14 11:45:26 +02:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Multires: Synchronize settings with Subsurf modifier Currently no functional changes, just exposes all settings which we need for OpenSubdiv, similar to what Subsurf modifier is doing already. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3602
2018-08-14 11:45:26 +02:00
prop = RNA_def_property(srna, "uv_smooth", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "uv_smooth");
RNA_def_property_enum_items(prop, prop_uv_smooth_items);
RNA_def_property_ui_text(prop, "UV Smooth", "Controls how smoothing is applied to UVs");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Multires: Synchronize settings with Subsurf modifier Currently no functional changes, just exposes all settings which we need for OpenSubdiv, similar to what Subsurf modifier is doing already. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3602
2018-08-14 11:45:26 +02:00
prop = RNA_def_property(srna, "quality", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "quality");
RNA_def_property_range(prop, 1, 10);
RNA_def_property_ui_range(prop, 1, 6, 1, -1);
RNA_def_property_ui_text(
prop, "Quality", "Accuracy of vertex positions, lower value is faster but less precise");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Subdivision Surfaces: add boundary smooth option to modifiers This adds the option to either smooth the entire boundary, or to keep corners sharp, for the Subdivision Surface and Multiresolution modifiers. This mainly helps with compatibility with other software. The default behavior remains to smooth the entire boundary. Differential Revision: https://developer.blender.org/D8485
2020-09-30 15:56:37 +02:00
prop = RNA_def_property(srna, "boundary_smooth", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "boundary_smooth");
RNA_def_property_enum_items(prop, prop_boundary_smooth_items);
RNA_def_property_ui_text(prop, "Boundary Smooth", "Controls how open boundaries are smoothed");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Multires: Synchronize settings with Subsurf modifier Currently no functional changes, just exposes all settings which we need for OpenSubdiv, similar to what Subsurf modifier is doing already. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3602
2018-08-14 11:45:26 +02:00
}
static void rna_def_modifier_subsurf(BlenderRNA *brna)
{
Multires: Remove simple subdivision type The simple subdivision as a type only causes issues like no-continuous normals across edges, inability to reliably switch the type and things like this. The new subdivision operators supports wider variety of how to add details to the model, which are more powerful than a single one-time decision on the subdivision type. The versioning code is adjusting topology converter to specify all edges as infinitely sharp. The reason for this (instead of using settings.is_simple) is because in a longer term the simple subdivision will be removed from Subsurf modifier as well, and will be replaced with more efficient bmesh-based modifier. This is finished up version of D8436. Differential Revision: https://developer.blender.org/D9350
2020-10-26 12:32:22 +01:00
static const EnumPropertyItem prop_subdivision_type_items[] = {
{SUBSURF_TYPE_CATMULL_CLARK, "CATMULL_CLARK", 0, "Catmull-Clark", ""},
{SUBSURF_TYPE_SIMPLE, "SIMPLE", 0, "Simple", ""},
{0, NULL, 0, NULL, NULL},
};
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SubsurfModifier", "Modifier");
UI: Do not use term 'Subsurf' So not to be confused with subsurf scatter Differential Revision: https://developer.blender.org/D8005
2020-06-14 19:06:37 -04:00
RNA_def_struct_ui_text(srna, "Subdivision Surface Modifier", "Subdivision surface modifier");
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
RNA_def_struct_sdna(srna, "SubsurfModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SUBSURF);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Multires: Remove simple subdivision type The simple subdivision as a type only causes issues like no-continuous normals across edges, inability to reliably switch the type and things like this. The new subdivision operators supports wider variety of how to add details to the model, which are more powerful than a single one-time decision on the subdivision type. The versioning code is adjusting topology converter to specify all edges as infinitely sharp. The reason for this (instead of using settings.is_simple) is because in a longer term the simple subdivision will be removed from Subsurf modifier as well, and will be replaced with more efficient bmesh-based modifier. This is finished up version of D8436. Differential Revision: https://developer.blender.org/D9350
2020-10-26 12:32:22 +01:00
rna_def_property_subdivision_common(srna);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Multires: Remove simple subdivision type The simple subdivision as a type only causes issues like no-continuous normals across edges, inability to reliably switch the type and things like this. The new subdivision operators supports wider variety of how to add details to the model, which are more powerful than a single one-time decision on the subdivision type. The versioning code is adjusting topology converter to specify all edges as infinitely sharp. The reason for this (instead of using settings.is_simple) is because in a longer term the simple subdivision will be removed from Subsurf modifier as well, and will be replaced with more efficient bmesh-based modifier. This is finished up version of D8436. Differential Revision: https://developer.blender.org/D9350
2020-10-26 12:32:22 +01:00
prop = RNA_def_property(srna, "subdivision_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "subdivType");
RNA_def_property_enum_items(prop, prop_subdivision_type_items);
RNA_def_property_ui_text(prop, "Subdivision Type", "Select type of subdivision algorithm");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
add subsurf limits, in RNA, there were none, but subsurf would assert at 29. Checked and subsurf level 11 gives over 3 million faces from a single triangle. So use this as a limit.
2013-04-26 11:30:16 +00:00
/* see CCGSUBSURF_LEVEL_MAX for max limit */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "levels", PROP_INT, PROP_UNSIGNED);
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
RNA_def_property_int_sdna(prop, NULL, "levels");
add subsurf limits, in RNA, there were none, but subsurf would assert at 29. Checked and subsurf level 11 gives over 3 million faces from a single triangle. So use this as a limit.
2013-04-26 11:30:16 +00:00
RNA_def_property_range(prop, 0, 11);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 6, 1, -1);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Levels", "Number of subdivisions to perform");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "render_levels", PROP_INT, PROP_UNSIGNED);
Added RNA for the Subsurf and Lattice modifiers.
2009-01-01 21:16:16 +00:00
RNA_def_property_int_sdna(prop, NULL, "renderLevels");
add subsurf limits, in RNA, there were none, but subsurf would assert at 29. Checked and subsurf level 11 gives over 3 million faces from a single triangle. So use this as a limit.
2013-04-26 11:30:16 +00:00
RNA_def_property_range(prop, 0, 11);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 6, 1, -1);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(
prop, "Render Levels", "Number of subdivisions to perform when rendering");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_only_control_edges", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Subsurf and Lattice modifiers.
2009-01-01 21:16:16 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_ControlEdges);
Sculpt Branch: * Smooth brush works again for multires. * Optimal Display option for multires modifier, same as subsurf.
2009-12-09 13:37:19 +00:00
RNA_def_property_ui_text(
prop, "Optimal Display", "Skip drawing/rendering of interior subdivided edges");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T63283: Second subdivision modifier does not ignore crease This is something where there is no single correct behavior, sometimes it's needed to ignore the crease to make mesh more smooth. But sometimes crease is to be considered after first subdivision surface: for example, when adding extra subdivisions for render-time displacement. Made it an option whether modifier needs to take crease into account or not. Existing files should be openable in the 2.7 compatible way, to re-create an old behavior the options is to be manually disabled in the modifier settings. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D4652
2019-04-05 14:13:05 +02:00
prop = RNA_def_property(srna, "use_creases", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_UseCrease);
RNA_def_property_ui_text(
prop, "Use Creases", "Use mesh edge crease information to sharpen edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
Modifiers: option to preserve custom normals for subsurf & multires
2020-07-22 15:03:17 +10:00
prop = RNA_def_property(srna, "use_custom_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_UseCustomNormals);
RNA_def_property_ui_text(
prop, "Use Custom Normals", "Interpolates existing custom normals to resulting mesh");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Subdivision Surfaces: add option disable using the limit surface This makes subdivision surfaces compatible with the old subdivision surface modifier and other applications that do not use the limit surface. This option is available on the Subdivision Surface modifier. Differential Revision: https://developer.blender.org/D8413
2020-09-30 15:47:08 +02:00
prop = RNA_def_property(srna, "use_limit_surface", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(
prop, NULL, "flags", eSubsurfModifierFlag_UseRecursiveSubdivision);
RNA_def_property_ui_text(prop,
"Use Limit Surface",
"Place vertices at the surface that would be produced with infinite "
"levels of subdivision (smoothest possible shape)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
static void rna_def_modifier_generic_map_info(StructRNA *srna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_texture_coordinates_items[] = {
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
{MOD_DISP_MAP_LOCAL,
"LOCAL",
0,
"Local",
"Use the local coordinate system for the texture coordinates"},
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
{MOD_DISP_MAP_GLOBAL,
"GLOBAL",
0,
"Global",
"Use the global coordinate system for the texture coordinates"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_DISP_MAP_OBJECT,
"OBJECT",
0,
"Object",
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"Use the linked object's local coordinate system for the texture coordinates"},
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
{MOD_DISP_MAP_UV, "UV", 0, "UV", "Use UV coordinates for the texture coordinates"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_ui_text(prop, "Texture", "");
RNA_def_property_flag(prop, PROP_EDITABLE);
Update relations when modifier texture changes
2018-12-06 09:09:07 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_enum_sdna(prop, NULL, "texmapping");
RNA_def_property_enum_items(prop, prop_texture_coordinates_items);
RNA_def_property_ui_text(prop, "Texture Coordinates", "");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, by Gaia Clary. Rationale: the name was confusing and not always used consistently, and this map itself is not something that can be layered, rather the map can be used as texture coordinates in some layered setup. The original intent was to indicate this contained more than just UV's, but the game engine settings have already been moved out, and apparently users didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
RNA_def_property_ui_text(prop, "UV Map", "UV map name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MappingInfoModifier_uvlayer_name_set");
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "texture_coords_object", PROP_POINTER, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "map_object");
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(
prop, "Texture Coordinate Object", "Object to set the texture coordinates");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
Modifiers: Add Bone option for Texture Mask Object This patch adds the option to use an armature bone in place of an object for texture mask coordinates. This affects the 3 vertex weight modifiers, the displace modifier, the warp modifier, and the wave modifier. With minor changes from Bastien Montagne (@mont29). Differential Revision: https://developer.blender.org/D7348
2020-04-10 14:03:36 +02:00
prop = RNA_def_property(srna, "texture_coords_bone", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "map_bone");
RNA_def_property_ui_text(prop, "Texture Coordinate Bone", "Bone to set the texture coordinates");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
}
static void rna_def_modifier_warp(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "WarpModifier", "Modifier");
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_struct_ui_text(srna, "Warp Modifier", "Warp modifier");
RNA_def_struct_sdna(srna, "WarpModifierData");
2.6 UI Modifier Icons: * New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself. * New Warp Icon, created by "Zafio" Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!
2012-02-12 19:57:47 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_WARP);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object_from", PROP_POINTER, PROP_NONE);
Warp modifier: add bone from and bone to options when using armature objects This commit adds the option to use armature bones for the From and To targets when using armature objects. The changes are based on the UV Warp modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6820
2020-03-27 10:27:00 +01:00
RNA_def_property_pointer_sdna(prop, NULL, "object_from");
RNA_def_property_ui_text(prop, "Object From", "Object to transform from");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Warp modifier: add bone from and bone to options when using armature objects This commit adds the option to use armature bones for the From and To targets when using armature objects. The changes are based on the UV Warp modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6820
2020-03-27 10:27:00 +01:00
prop = RNA_def_property(srna, "bone_from", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "bone_from");
RNA_def_property_ui_text(prop, "Bone From", "Bone to transform from");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object_to", PROP_POINTER, PROP_NONE);
Warp modifier: add bone from and bone to options when using armature objects This commit adds the option to use armature bones for the From and To targets when using armature objects. The changes are based on the UV Warp modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6820
2020-03-27 10:27:00 +01:00
RNA_def_property_pointer_sdna(prop, NULL, "object_to");
RNA_def_property_ui_text(prop, "Object To", "Object to transform to");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Warp modifier: add bone from and bone to options when using armature objects This commit adds the option to use armature bones for the From and To targets when using armature objects. The changes are based on the UV Warp modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6820
2020-03-27 10:27:00 +01:00
prop = RNA_def_property(srna, "bone_to", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "bone_to");
RNA_def_property_ui_text(prop, "Bone To", "Bone defining offset");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100, 100, 10, 2);
RNA_def_property_ui_text(prop, "Strength", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
RNA_def_property_enum_items(prop, modifier_warp_falloff_items);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_ui_text(prop, "Falloff Type", "");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_radius", PROP_FLOAT, PROP_UNSIGNED | PROP_DISTANCE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_ui_text(prop, "Radius", "Radius to apply");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_curve", PROP_POINTER, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "curfalloff");
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
RNA_def_property_ui_text(prop, "Falloff Curve", "Custom falloff curve");
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_volume_preserve", PROP_BOOLEAN, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WARP_VOLUME_PRESERVE);
RNA_def_property_ui_text(prop, "Preserve Volume", "Preserve volume when rotations are used");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name for modulating the deform");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WarpModifier_defgrp_name_set");
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Warp Modifier add invert vgroup option Adds the invert vertex weights option to the Warp Modifier. Setup in the same way as the other modifiers. Uses the existing flag char that is labeled unused. Differential Revision: https://developer.blender.org/D6720
2020-02-03 12:01:13 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WARP_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
rna_def_modifier_generic_map_info(srna);
}
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
static void rna_def_modifier_multires(BlenderRNA *brna)
{
StructRNA *srna;
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "MultiresModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Multires Modifier", "Multiresolution mesh modifier");
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
RNA_def_struct_sdna(srna, "MultiresModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_MULTIRES);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Multires: Remove simple subdivision type The simple subdivision as a type only causes issues like no-continuous normals across edges, inability to reliably switch the type and things like this. The new subdivision operators supports wider variety of how to add details to the model, which are more powerful than a single one-time decision on the subdivision type. The versioning code is adjusting topology converter to specify all edges as infinitely sharp. The reason for this (instead of using settings.is_simple) is because in a longer term the simple subdivision will be removed from Subsurf modifier as well, and will be replaced with more efficient bmesh-based modifier. This is finished up version of D8436. Differential Revision: https://developer.blender.org/D9350
2020-10-26 12:32:22 +01:00
rna_def_property_subdivision_common(srna);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "levels", PROP_INT, PROP_UNSIGNED);
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
RNA_def_property_int_sdna(prop, NULL, "lvl");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Levels", "Number of subdivisions to use in the viewport");
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "sculpt_levels", PROP_INT, PROP_UNSIGNED);
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
RNA_def_property_int_sdna(prop, NULL, "sculptlvl");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Sculpt Levels", "Number of subdivisions to use in sculpt mode");
* Added range function for Multires's level RNA * Removed RNA for old multires in Mesh, the old mesh->mr struct should never be used (except for loading old files) * Dealt with sculpt + render (just needed to force multires update) * sculpt memory leaks fixed * Entering editmode now always exits paint modes (previously, only happened if editmode was called from the header button)
2009-02-05 01:12:47 +00:00
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "render_levels", PROP_INT, PROP_UNSIGNED);
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
RNA_def_property_int_sdna(prop, NULL, "renderlvl");
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Render Levels", "The subdivision level visible at render time");
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "total_levels", PROP_INT, PROP_UNSIGNED);
Sculpt: Multires * Displacement coordinates are now stored differently, as a grid per face corner. This means there is duplication of coordinates, especially at low subdivision levels, but the simpler implementation justifies it I think. * ToDo: conversion of existing multires files (2.4x or 2.5x), loading them may even crash now. * Editmode preservation/interpolation code also has not been updated yet. * Multires now works on the CCGDerivedMesh grids instead of CDDerivedMesh, which should be more memory efficient. * There are still bad memory peaks (if you're using 32bit) when subdividing or propagating displacements. Though at least there should be no huge memory blocks allocated, which windows is now to have trouble with. * Still found some weird spike artifacts at lower multires levels, some also happening before this commit. Perhaps computation of tangents needs to be tweaked more. * Multires modifier now has viewport, sculpt and render levels. Also the levels have been made consistent with subsurf, previously the same level of subdivision was one less for multires. * Both multires and subsurf modifier now can have their subdivision level set to 0 for no subdivision.
2009-11-25 14:07:12 +00:00
RNA_def_property_int_sdna(prop, NULL, "totlvl");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(
prop, "Total Levels", "Number of subdivisions for which displacements are stored");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "is_external", PROP_BOOLEAN, PROP_NONE);
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_boolean_funcs(prop, "rna_MultiresModifier_external_get", NULL);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop, "External", "Store multires displacements outside the .blend file, to save memory");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_string_funcs(prop,
"rna_MultiresModifier_filepath_get",
"rna_MultiresModifier_filepath_length",
"rna_MultiresModifier_filepath_set");
rename some rna properties filename --> filepath * filename == "foo.ext" * filepath == "/path/to/and/including/foo.ext" this was alredy followed in some places not not everywhere.
2010-06-02 17:58:28 +00:00
RNA_def_property_ui_text(prop, "File Path", "Path to external displacements file");
Sculpt Branch: Revised external multires file saving. Now it is more manual in that you have to specify where to save it, like an image file, but still saved at the same time as the .blend. It would ideally be automatic, but this is difficult to implement, so for now this should at least be more reliable.
2009-12-10 14:26:06 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_only_control_edges", PROP_BOOLEAN, PROP_NONE);
Sculpt Branch: * Smooth brush works again for multires. * Optimal Display option for multires modifier, same as subsurf.
2009-12-09 13:37:19 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", eMultiresModifierFlag_ControlEdges);
RNA_def_property_ui_text(
prop, "Optimal Display", "Skip drawing/rendering of interior subdivided edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T63283: Second subdivision modifier does not ignore crease This is something where there is no single correct behavior, sometimes it's needed to ignore the crease to make mesh more smooth. But sometimes crease is to be considered after first subdivision surface: for example, when adding extra subdivisions for render-time displacement. Made it an option whether modifier needs to take crease into account or not. Existing files should be openable in the 2.7 compatible way, to re-create an old behavior the options is to be manually disabled in the modifier settings. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D4652
2019-04-05 14:13:05 +02:00
prop = RNA_def_property(srna, "use_creases", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", eMultiresModifierFlag_UseCrease);
RNA_def_property_ui_text(
prop, "Use Creases", "Use mesh edge crease information to sharpen edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
Modifiers: option to preserve custom normals for subsurf & multires
2020-07-22 15:03:17 +10:00
prop = RNA_def_property(srna, "use_custom_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", eMultiresModifierFlag_UseCustomNormals);
RNA_def_property_ui_text(
prop, "Use Custom Normals", "Interpolates existing custom normals to resulting mesh");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Multires: Base Mesh Sculpting This adds an option to the Multires modifier to sculpt directly on the base mesh while previewing the displacement of a higher subdivisions level. What this does it considering Multires as a regular modifier without exposing the grid displacement to sculpt mode. This allows to see the propagation happening in real time, which enables to use complex tools like Cloth or Pose in much higher resolutions and without surface noise and artifacts. Reviewed By: sergey, Severin Differential Revision: https://developer.blender.org/D8555
2020-08-14 00:23:54 +02:00
prop = RNA_def_property(srna, "use_sculpt_base_mesh", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", eMultiresModifierFlag_UseSculptBaseMesh);
RNA_def_property_ui_text(prop,
"Sculpt Base Mesh",
"Make Sculpt Mode tools deform the base mesh while previewing the "
"displacement of higher subdivision levels");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
}
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
static void rna_def_modifier_lattice(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Subsurf and Lattice modifiers.
2009-01-01 21:16:16 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "LatticeModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Lattice Modifier", "Lattice deformation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "LatticeModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_LATTICE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Lattice object to deform with");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_LatticeModifier_object_set", NULL, "rna_Lattice_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for the Subsurf and Lattice modifiers.
2009-01-01 21:16:16 +00:00
RNA_def_property_string_sdna(prop, NULL, "name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_LatticeModifier_name_set");
Lattice Modifier add invert vgroup option Adds the invert vertex group option to the Lattice modifier. Adds a short flag and modifies the existing char padding for the correct amount. Adds a .invert_vgroup to the LatticeDeformUserdata. Passes the flag into the lattice_deform_verts function where the weights around found and used. For the other calls of lattice_deform_verts function they pass in NULL for the flag in the same way they pass NULL for the vgroup name. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6747
2020-02-06 11:18:41 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LATTICE_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
rename lattice influence to strength from r45144 (other deform modifiers call it strength too)
2012-03-26 00:42:21 +00:00
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
Patch: [#30652] Influence slider for Lattice Modifier * This patch adds a influence slider for the lattice modifier, which affects the strength of the deformation. Patch by Patrick Boelens (senshi), thanks a lot!
2012-03-25 22:14:21 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 1, 10, 2);
rename lattice influence to strength from r45144 (other deform modifiers call it strength too)
2012-03-26 00:42:21 +00:00
RNA_def_property_ui_text(prop, "Strength", "Strength of modifier effect");
Patch: [#30652] Influence slider for Lattice Modifier * This patch adds a influence slider for the lattice modifier, which affects the strength of the deformation. Patch by Patrick Boelens (senshi), thanks a lot!
2012-03-25 22:14:21 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_curve(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Curve modifier.
2009-01-01 23:32:49 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_deform_axis_items[] = {
RNA * Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
2009-06-16 00:52:21 +00:00
{MOD_CURVE_POSX, "POS_X", 0, "X", ""},
{MOD_CURVE_POSY, "POS_Y", 0, "Y", ""},
{MOD_CURVE_POSZ, "POS_Z", 0, "Z", ""},
{MOD_CURVE_NEGX, "NEG_X", 0, "-X", ""},
{MOD_CURVE_NEGY, "NEG_Y", 0, "-Y", ""},
{MOD_CURVE_NEGZ, "NEG_Z", 0, "-Z", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "CurveModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Curve Modifier", "Curve deformation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "CurveModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_CURVE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Curve object to deform with");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_CurveModifier_object_set", NULL, "rna_Curve_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
RNA_def_property_update(prop, 0, "rna_CurveModifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Curve modifier.
2009-01-01 23:32:49 +00:00
RNA_def_property_string_sdna(prop, NULL, "name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_CurveModifier_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Curve Modifier add invert vgroup option Adds the invert vertex group option to the Curve modifier. Adds a short flag and char pad to the Curve modifier DNA. Passes the flag into the curve_deform_verts function as the weight values are found there and not in the modifiers .c file. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6746
2020-02-06 11:46:41 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CURVE_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "deform_axis", PROP_ENUM, PROP_NONE);
Added RNA for Curve modifier.
2009-01-01 23:32:49 +00:00
RNA_def_property_enum_sdna(prop, NULL, "defaxis");
RNA_def_property_enum_items(prop, prop_deform_axis_items);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Deform Axis", "The axis that the curve deforms along");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_build(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Build modifier.
2009-01-01 21:49:04 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "BuildModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Build Modifier", "Build effect modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "BuildModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_BUILD);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME);
rna rename start/end --> frame_start/end
2010-04-22 17:35:00 +00:00
RNA_def_property_float_sdna(prop, NULL, "start");
NLA SoC: Current Frame can now be negative This commit is quite experimental, and might have to be reverted, but in quite a few places, the cleanups from this commit were already necessary. * I've left most of the image-handling functions alone, since I'm not sure how well they cope with negative indices. * Start/End frames cannot be negative for now... any specific reasons why they should be negative?
2009-07-07 06:56:29 +00:00
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
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
RNA_def_property_ui_text(prop, "Start Frame", "Start frame of the effect");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "frame_duration", PROP_FLOAT, PROP_TIME);
rna renaming (manual edits)
2010-08-21 04:51:00 +00:00
RNA_def_property_float_sdna(prop, NULL, "length");
Added RNA for the Build modifier.
2009-01-01 21:49:04 +00:00
RNA_def_property_range(prop, 1, MAXFRAMEF);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop, "Length", "Total time the build effect requires");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Build Modifier - Add "Reversed" Option This commit introduces the ability to make the Build Modifier operate in reverse, essentially allowing it to be used as a "deconstruction" effect. (See D219 for more details about use cases for this)
2014-01-17 00:13:36 +13:00
prop = RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_BUILD_FLAG_REVERSE);
RNA_def_property_ui_text(prop, "Reversed", "Deconstruct the mesh instead of building it");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_random_order", PROP_BOOLEAN, PROP_NONE);
Build Modifier - Add "Reversed" Option This commit introduces the ability to make the Build Modifier operate in reverse, essentially allowing it to be used as a "deconstruction" effect. (See D219 for more details about use cases for this)
2014-01-17 00:13:36 +13:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_BUILD_FLAG_RANDOMIZE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Randomize", "Randomize the faces or edges during build");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "seed", PROP_INT, PROP_NONE);
Added RNA for the Build modifier.
2009-01-01 21:49:04 +00:00
RNA_def_property_range(prop, 1, MAXFRAMEF);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop, "Seed", "Seed for random if used");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_mirror(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "MirrorModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Mirror Modifier", "Mirroring modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "MirrorModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_MIRROR);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Cleanup: use boolean array for mirror modifier
2018-11-21 10:27:19 +11:00
prop = RNA_def_property(srna, "use_axis", PROP_BOOLEAN, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_X);
Cleanup: use boolean array for mirror modifier
2018-11-21 10:27:19 +11:00
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Mirror Axis", "Enable axis mirror");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use boolean array for mirror modifier
2018-11-21 10:27:19 +11:00
prop = RNA_def_property(srna, "use_bisect_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_BISECT_AXIS_X);
RNA_def_property_array(prop, 3);
Fix/cleanup another bunch of UI messages issues. Also (mostly in comments): behaviour -> behavior (we use American English).
2018-12-24 12:31:39 +01:00
RNA_def_property_ui_text(prop, "Bisect Axis", "Cuts the mesh across the mirror plane");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use boolean array for mirror modifier
2018-11-21 10:27:19 +11:00
prop = RNA_def_property(srna, "use_bisect_flip_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_BISECT_FLIP_AXIS_X);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Bisect Flip Axis", "Flips the direction of the slice");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_clip", PROP_BOOLEAN, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_CLIPPING);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(
prop, "Clip", "Prevent vertices from going through the mirror during transform");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_mirror_vertex_groups", PROP_BOOLEAN, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_VGROUP);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Mirror Vertex Groups", "Mirror vertex groups (e.g. .R->.L)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_mirror_merge", PROP_BOOLEAN, PROP_NONE);
small fix so older files are loaded with merge on in the mirror modifiers
2011-02-10 00:44:26 +00:00
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", MOD_MIR_NO_MERGE);
patch [#26861] Spelling, Typos, and Grammar - also fix own bad assert from yesterday & remove testing cmake print.
2011-04-11 01:18:25 +00:00
RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices within the merge threshold");
small feature request from zanqdo, merging in the mirror modifier is now optional, simply turning town the merge limit just simply do anything, and merging is off by default as this seems more logical behaviour
2011-02-10 00:05:03 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_mirror_u", PROP_BOOLEAN, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_U);
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
RNA_def_property_ui_text(
prop, "Mirror U", "Mirror the U texture coordinate around the flip offset point");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_mirror_v", PROP_BOOLEAN, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_V);
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
RNA_def_property_ui_text(
prop, "Mirror V", "Mirror the V texture coordinate around the flip offset point");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Fix T75793: Mirror modifier UV flip only works on first UDIM Tile Was flipping around the 0-1 range, now (optionally) flip around each tile. Also added this option for BMesh bmo_mirror. Reviewed By: campbellbarton Maniphest Tasks: T75793 Differential Revision: https://developer.blender.org/D7460
2020-05-07 12:34:13 +02:00
prop = RNA_def_property(srna, "use_mirror_udim", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_UDIM);
RNA_def_property_ui_text(
prop, "Mirror UDIM", "Mirror the texture coordinate around each tile center");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mirror Modifier: Add offsets for mirrored UVs The mirror modifier now has two fields that specify a -1 to 1 offset for the U and V axes when mirroring their coordinates. D1844 by @circuitfox
2017-03-30 12:39:51 +11:00
prop = RNA_def_property(srna, "mirror_offset_u", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset[0]");
RNA_def_property_range(prop, -1, 1);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
RNA_def_property_ui_text(
prop,
"Flip U Offset",
"Amount to offset mirrored UVs flipping point from the 0.5 on the U axis");
Mirror Modifier: Add offsets for mirrored UVs The mirror modifier now has two fields that specify a -1 to 1 offset for the U and V axes when mirroring their coordinates. D1844 by @circuitfox
2017-03-30 12:39:51 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mirror Modifier: Add offsets for mirrored UVs The mirror modifier now has two fields that specify a -1 to 1 offset for the U and V axes when mirroring their coordinates. D1844 by @circuitfox
2017-03-30 12:39:51 +11:00
prop = RNA_def_property(srna, "mirror_offset_v", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset[1]");
RNA_def_property_range(prop, -1, 1);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
RNA_def_property_ui_text(
prop,
"Flip V Offset",
"Amount to offset mirrored UVs flipping point from the 0.5 point on the V axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
prop = RNA_def_property(srna, "offset_u", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset_copy[0]");
RNA_def_property_range(prop, -10000.0f, 10000.0f);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
RNA_def_property_ui_text(prop, "U Offset", "Mirrored UV offset on the U axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mirror Modifier: option to offset UV's Useful for baking, so UV's can be moved outside the image and not used to bake pixels (but still used for display). D2801 by @Zuorion
2017-09-25 14:11:27 +10:00
prop = RNA_def_property(srna, "offset_v", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset_copy[1]");
RNA_def_property_range(prop, -10000.0f, 10000.0f);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
RNA_def_property_ui_text(prop, "V Offset", "Mirrored UV offset on the V axis");
Mirror Modifier: Add offsets for mirrored UVs The mirror modifier now has two fields that specify a -1 to 1 offset for the U and V axes when mirroring their coordinates. D1844 by @circuitfox
2017-03-30 12:39:51 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_float_sdna(prop, NULL, "tolerance");
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
made the merge limit show more precission and use a lower step.
2009-11-21 18:12:45 +00:00
RNA_def_property_ui_range(prop, 0, 1, 0.01, 6);
Fix T44630: incorrect mirror modifier merge limit tooltip.
2015-05-07 10:56:45 +02:00
RNA_def_property_ui_text(
UI: use term 'Merge Distance' instead of 'Merge Limit'
2020-06-07 23:40:14 -04:00
prop, "Merge Distance", "Distance within which mirrored vertices are merged");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mirror_object", PROP_POINTER, PROP_NONE);
Added RNA for Mirror modifier.
2009-01-01 22:43:58 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "mirror_ob");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Mirror Object", "Object to use as mirror");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_decimate(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem modifier_decim_mode_items[] = {
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
{MOD_DECIM_MODE_COLLAPSE, "COLLAPSE", 0, "Collapse", "Use edge collapsing"},
{MOD_DECIM_MODE_UNSUBDIV, "UNSUBDIV", 0, "Un-Subdivide", "Use un-subdivide face reduction"},
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
{MOD_DECIM_MODE_DISSOLVE,
"DISSOLVE",
0,
"Planar",
"Dissolve geometry to form planar polygons"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
BMesh: add decimate edit-mode tool Support applying decimate to the mesh selection.
2016-07-08 23:35:27 +10:00
/* Note, keep in sync with operator 'MESH_OT_decimate' */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
StructRNA *srna;
Added RNA for decimate modifier.
2009-01-01 23:47:32 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "DecimateModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Decimate Modifier", "Decimation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "DecimateModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_DECIM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
prop = RNA_def_property(srna, "decimate_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");
RNA_def_property_enum_items(prop, modifier_decim_mode_items);
RNA_def_property_ui_text(prop, "Mode", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* (mode == MOD_DECIM_MODE_COLLAPSE) */
Changed percentage and 0-1 number fields to use sliders. This is more consistent. Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
2014-01-02 20:54:24 +01:00
prop = RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_FACTOR);
Added RNA for decimate modifier.
2009-01-01 23:47:32 +00:00
RNA_def_property_float_sdna(prop, NULL, "percent");
RNA_def_property_range(prop, 0, 1);
enable bmesh decimator by default.
2012-10-22 02:09:41 +00:00
RNA_def_property_ui_range(prop, 0, 1, 1, 4);
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
RNA_def_property_ui_text(prop, "Ratio", "Ratio of triangles to reduce to (collapse only)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* (mode == MOD_DECIM_MODE_UNSUBDIV) */
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "iter");
RNA_def_property_range(prop, 0, SHRT_MAX);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 100, 1, -1);
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
RNA_def_property_ui_text(
prop, "Iterations", "Number of times reduce the geometry (unsubdivide only)");
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* (mode == MOD_DECIM_MODE_DISSOLVE) */
prop = RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "angle");
RNA_def_property_range(prop, 0, DEG2RAD(180));
RNA: angle step-sizes were too small These were ignored previously, so it wasn't noticeable.
2015-09-21 09:44:14 +10:00
RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 10, 2);
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
RNA_def_property_ui_text(prop, "Angle Limit", "Only dissolve angles below this (planar only)");
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* (mode == MOD_DECIM_MODE_COLLAPSE) */
add vertex group option to decimate modifier, handy if you want to pin some parts of the geometry.
2012-10-22 15:39:06 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name (collapse only)");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DecimateModifier_defgrp_name_set");
add vertex group option to decimate modifier, handy if you want to pin some parts of the geometry.
2012-10-22 15:39:06 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add vertex group option to decimate modifier, handy if you want to pin some parts of the geometry.
2012-10-22 15:39:06 +00:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
add un-subdivude as an optional method for the decimate modifier, gives more even geometry & nicer results in some cases.
2012-10-23 04:26:39 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_INVERT_VGROUP);
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence (collapse only)");
add vertex group option to decimate modifier, handy if you want to pin some parts of the geometry.
2012-10-22 15:39:06 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add option to planar decimator to collapse all verts that define face boundries (verts that 2 faces share and have 2 edge users). avoids ugly stepping between faces when applying on curves surfaces. (but less useful for architectural style models)
2012-10-23 06:13:56 +00:00
prop = RNA_def_property(srna, "use_collapse_triangulate", PROP_BOOLEAN, PROP_NONE);
add option for decimate-collapse to keep triangulated geometry (normally quads stay as quads when not collapsed).
2012-10-23 05:30:10 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_TRIANGULATE);
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
RNA_def_property_ui_text(
prop, "Triangulate", "Keep triangulated faces resulting from decimation (collapse only)");
add option for decimate-collapse to keep triangulated geometry (normally quads stay as quads when not collapsed).
2012-10-23 05:30:10 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
BMesh: symmetry aware decimate Support for decimating while maintaining symmetry on a single axis.
2015-11-18 07:50:07 +11:00
prop = RNA_def_property(srna, "use_symmetry", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_SYMMETRY);
RNA_def_property_ui_text(prop, "Symmetry", "Maintain symmetry on an axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
BMesh: symmetry aware decimate Support for decimating while maintaining symmetry on a single axis.
2015-11-18 07:50:07 +11:00
prop = RNA_def_property(srna, "symmetry_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "symmetry_axis");
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
BMesh: symmetry aware decimate Support for decimating while maintaining symmetry on a single axis.
2015-11-18 07:50:07 +11:00
RNA_def_property_ui_text(prop, "Axis", "Axis of symmetry");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "vertex_group_factor", PROP_FLOAT, PROP_FACTOR);
BMesh decimate, improve behavior with weights Add slider to adjust the influence of weights relative to geometry distortion. This allows subtle influences to be applied - without drastic changes in behavior.
2015-06-04 19:49:59 +10:00
RNA_def_property_float_sdna(prop, NULL, "defgrp_factor");
BMesh: decimator, allow vgroup factor over 1 Can be useful to apply more extreme weighting
2015-06-05 15:26:37 +10:00
RNA_def_property_range(prop, 0, 1000);
RNA_def_property_ui_range(prop, 0, 10, 1, 4);
BMesh decimate, improve behavior with weights Add slider to adjust the influence of weights relative to geometry distortion. This allows subtle influences to be applied - without drastic changes in behavior.
2015-06-04 19:49:59 +10:00
RNA_def_property_ui_text(prop, "Factor", "Vertex group strength");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* end collapse-only option */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add option to planar decimator to collapse all verts that define face boundries (verts that 2 faces share and have 2 edge users). avoids ugly stepping between faces when applying on curves surfaces. (but less useful for architectural style models)
2012-10-23 06:13:56 +00:00
/* (mode == MOD_DECIM_MODE_DISSOLVE) */
prop = RNA_def_property(srna, "use_dissolve_boundaries", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS);
Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...
2012-10-26 17:32:50 +00:00
RNA_def_property_ui_text(
Cleanup: spelling
2019-08-31 01:19:22 +10:00
prop, "All Boundaries", "Dissolve all vertices in between face boundaries (planar only)");
add option to planar decimator to collapse all verts that define face boundries (verts that 2 faces share and have 2 edge users). avoids ugly stepping between faces when applying on curves surfaces. (but less useful for architectural style models)
2012-10-23 06:13:56 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
fix [#35311] Planar Decimate / Limited Dissolve fails to merge some adjacent faces optionally limit by face flipping, also added support to delimit by material and edge crease.
2013-06-03 05:07:16 +00:00
prop = RNA_def_property(srna, "delimit", PROP_ENUM, PROP_NONE);
RNA_def_property_flag(prop, PROP_ENUM_FLAG); /* important to run before default set */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_mesh_delimit_mode_items);
fix [#35311] Planar Decimate / Limited Dissolve fails to merge some adjacent faces optionally limit by face flipping, also added support to delimit by material and edge crease.
2013-06-03 05:07:16 +00:00
RNA_def_property_ui_text(prop, "Delimit", "Limit merging geometry");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add option to planar decimator to collapse all verts that define face boundries (verts that 2 faces share and have 2 edge users). avoids ugly stepping between faces when applying on curves surfaces. (but less useful for architectural style models)
2012-10-23 06:13:56 +00:00
/* end dissolve-only option */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add limited dissolve as a decimation type to the decimate modifier.
2012-10-23 05:20:02 +00:00
/* all modes use this */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "face_count", PROP_INT, PROP_NONE);
RNA: * Allow pointers to be editable, did SpaceTextEditor.text as a test. * Changed PROP_NOT_EDITABLE to PROP_EDITABLE, and added RNA_def_property_clear_flag. * Removed rna_dependency.c test code.
2009-03-23 13:24:48 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(
prop, "Face Count", "The current number of faces in the decimated mesh");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_wave(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "WaveModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Wave Modifier", "Wave effect modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "WaveModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_X);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "X", "X axis motion");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_Y);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Y", "Y axis motion");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_CYCL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Cyclic", "Cyclic wave effect");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM);
Great patch by Harley Acheson fixing about 80 typos and spelling mistakes in makesrna
2010-05-04 05:15:53 +00:00
RNA_def_property_ui_text(prop, "Normals", "Displace along normals");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal_x", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_X);
RNA_def_property_ui_text(prop, "X Normal", "Enable displacement along the X normal");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal_y", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Y);
RNA_def_property_ui_text(prop, "Y Normal", "Enable displacement along the Y normal");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal_z", PROP_BOOLEAN, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Z);
RNA_def_property_ui_text(prop, "Z Normal", "Enable displacement along the Z normal");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Units: Fix some property subtypes This commit only contains some of the changes in the diff. Some require more discussion/work. Differential Revision: https://developer.blender.org/D4337
2019-02-19 15:23:46 +01:00
prop = RNA_def_property(srna, "time_offset", PROP_FLOAT, PROP_TIME);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "timeoffs");
NLA SoC: Current Frame can now be negative This commit is quite experimental, and might have to be reverted, but in quite a few places, the cleanups from this commit were already necessary. * I've left most of the image-handling functions alone, since I'm not sure how well they cope with negative indices. * Start/End frames cannot be negative for now... any specific reasons why they should be negative?
2009-07-07 06:56:29 +00:00
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Time Offset",
"Either the starting frame (for positive speed) or ending frame (for negative speed.)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lifetime", PROP_FLOAT, PROP_TIME);
rna data path names which are more likely to break animations. Added an operator "Update Animation Data", access from the search menu to update drivers and fcurves.
2010-08-20 06:09:58 +00:00
RNA_def_property_float_sdna(prop, NULL, "lifetime");
NLA SoC: Current Frame can now be negative This commit is quite experimental, and might have to be reverted, but in quite a few places, the cleanups from this commit were already necessary. * I've left most of the image-handling functions alone, since I'm not sure how well they cope with negative indices. * Start/End frames cannot be negative for now... any specific reasons why they should be negative?
2009-07-07 06:56:29 +00:00
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(
prop, "Lifetime", "Lifetime of the wave in frames, zero means infinite");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "damping_time", PROP_FLOAT, PROP_TIME);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "damp");
NLA SoC: Current Frame can now be negative This commit is quite experimental, and might have to be reverted, but in quite a few places, the cleanups from this commit were already necessary. * I've left most of the image-handling functions alone, since I'm not sure how well they cope with negative indices. * Start/End frames cannot be negative for now... any specific reasons why they should be negative?
2009-07-07 06:56:29 +00:00
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(
prop, "Damping Time", "Number of frames in which the wave damps out after it dies");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_radius", PROP_FLOAT, PROP_DISTANCE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "falloff");
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 100, 100, 2);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Falloff Radius", "Distance after which it fades out");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "start_position_x", PROP_FLOAT, PROP_DISTANCE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "startx");
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_ui_range(prop, -100, 100, 100, 2);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Start Position X", "X coordinate of the start position");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "start_position_y", PROP_FLOAT, PROP_DISTANCE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "starty");
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_ui_range(prop, -100, 100, 100, 2);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop, "Start Position Y", "Y coordinate of the start position");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "start_position_object", PROP_POINTER, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "objectcenter");
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Start Position Object", "Object which defines the wave center");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name for modulating the wave");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WaveModifier_defgrp_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Wave add invert vgroup option Adds the invert vgroup option to the Wave modifier. Differential Revision: https://developer.blender.org/D6893
2020-03-03 18:41:50 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "speed", PROP_FLOAT, PROP_NONE);
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
2.5: Defaults * Wave modifier speed 0.5 -> 0.25. * Particles even and random distribution on. * Particles normal velocity 0.0 -> 1.0. * Particles size 1.0 -> 0.05. * Particles draw emitter and material color on. * Field strength 0.0 -> 1.0 * Object drawing without material was not consistent with default material. * Panel title 13 -> 12 points.
2009-07-15 22:58:12 +00:00
RNA_def_property_ui_range(prop, -1, 1, 10, 2);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(
prop, "Speed", "Speed of the wave, towards the starting point when negative");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_DISTANCE);
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_ui_range(prop, -2, 2, 10, 2);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Height", "Height of the wave");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_DISTANCE);
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 5, 10, 2);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Width", "Distance between the waves");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "narrowness", PROP_FLOAT, PROP_DISTANCE);
Added RNA for Wave modifier. Note: I didn't set up the property for uvlayer_tmp (used when the wave is modulated using UV texture coordinates.) Wasn't sure how to do this properly.
2009-01-02 00:53:49 +00:00
RNA_def_property_float_sdna(prop, NULL, "narrow");
Fixed up the range and UI ranges for the modifiers I've done.
2009-01-02 02:25:29 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 10, 10, 2);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Narrowness",
"Distance between the top and the base of a wave, the higher the value, "
"the more narrow the wave");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
svn merge ^/trunk/blender -r43092:43092
2012-01-04 06:20:10 +00:00
rna_def_modifier_generic_map_info(srna);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_armature(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Armature modifier
2009-01-02 01:28:02 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ArmatureModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Armature Modifier", "Armature deformation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ArmatureModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_ARMATURE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Armature object to deform with");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ArmatureModifier_object_set", NULL, "rna_Armature_object_poll");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_bone_envelopes", PROP_BOOLEAN, PROP_NONE);
[#24802] Invert vertex group not inverting armature modifier influence the armature vertex group options only apply to Multi-Modifier, rename and edit the UI to make this clear.
2010-11-19 03:09:51 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_ENVELOPE);
Fix T59848: precisely represent the dependencies of Armature modifier. When the modifier uses vertex groups, the set of the bones it actually needs is precisely defined by the set of the group names. If envelopes are enabled, this refinement is not available, because any bone can potentially be used. This can be used in the dependency graph construction to allow objects deformed by a part of the armature to be used in constraints on other bones, e.g. for placing cartoon-style face elements on top of the body mesh via Shrinkwrap constraints. Since the list of vertex group names is now used as an input by the dependency graph, adding/removing/renaming groups should now be triggering a graph rebuild. Differential Revision: https://developer.blender.org/D4715
2019-04-24 16:24:53 +03:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
RNA_def_property_ui_text(prop, "Use Bone Envelopes", "Bind Bone envelopes to armature modifier");
Fix T59848: precisely represent the dependencies of Armature modifier. When the modifier uses vertex groups, the set of the bones it actually needs is precisely defined by the set of the group names. If envelopes are enabled, this refinement is not available, because any bone can potentially be used. This can be used in the dependency graph construction to allow objects deformed by a part of the armature to be used in constraints on other bones, e.g. for placing cartoon-style face elements on top of the body mesh via Shrinkwrap constraints. Since the list of vertex group names is now used as an input by the dependency graph, adding/removing/renaming groups should now be triggering a graph rebuild. Differential Revision: https://developer.blender.org/D4715
2019-04-24 16:24:53 +03:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_vertex_groups", PROP_BOOLEAN, PROP_NONE);
Added RNA for Armature modifier
2009-01-02 01:28:02 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_VGROUP);
Fix T59848: precisely represent the dependencies of Armature modifier. When the modifier uses vertex groups, the set of the bones it actually needs is precisely defined by the set of the group names. If envelopes are enabled, this refinement is not available, because any bone can potentially be used. This can be used in the dependency graph construction to allow objects deformed by a part of the armature to be used in constraints on other bones, e.g. for placing cartoon-style face elements on top of the body mesh via Shrinkwrap constraints. Since the list of vertex group names is now used as an input by the dependency graph, adding/removing/renaming groups should now be triggering a graph rebuild. Differential Revision: https://developer.blender.org/D4715
2019-04-24 16:24:53 +03:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
RNA_def_property_ui_text(prop, "Use Vertex Groups", "Bind vertex groups to armature modifier");
Fix T59848: precisely represent the dependencies of Armature modifier. When the modifier uses vertex groups, the set of the bones it actually needs is precisely defined by the set of the group names. If envelopes are enabled, this refinement is not available, because any bone can potentially be used. This can be used in the dependency graph construction to allow objects deformed by a part of the armature to be used in constraints on other bones, e.g. for placing cartoon-style face elements on top of the body mesh via Shrinkwrap constraints. Since the list of vertex group names is now used as an input by the dependency graph, adding/removing/renaming groups should now be triggering a graph rebuild. Differential Revision: https://developer.blender.org/D4715
2019-04-24 16:24:53 +03:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_deform_preserve_volume", PROP_BOOLEAN, PROP_NONE);
Added RNA for Armature modifier
2009-01-02 01:28:02 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_QUATERNION);
[#24802] Invert vertex group not inverting armature modifier influence the armature vertex group options only apply to Multi-Modifier, rename and edit the UI to make this clear.
2010-11-19 03:09:51 +00:00
RNA_def_property_ui_text(
prop, "Preserve Volume", "Deform rotation interpolation with quaternions");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_multi_modifier", PROP_BOOLEAN, PROP_NONE);
UI: * Made separator item work horizontal & vertical. * Add colon (:) automatic for int/float/enum/string. * Added space variables to uiStyle and use them in the layout engine. * Added initial World buttons by Thomas Dinges, thanks! * Added some code for modifiers in the Object Data context. This will become a template though. * Use a common poll() callback in the scripts to reduce code.
2009-04-27 18:05:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "multi", 0);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Multi Modifier",
"Use same input as previous modifier, and mix results using overall vgroup");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
[#24802] Invert vertex group not inverting armature modifier influence the armature vertex group options only apply to Multi-Modifier, rename and edit the UI to make this clear.
2010-11-19 03:09:51 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ArmatureModifier_defgrp_name_set");
[#24802] Invert vertex group not inverting armature modifier influence the armature vertex group options only apply to Multi-Modifier, rename and edit the UI to make this clear.
2010-11-19 03:09:51 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
[#24802] Invert vertex group not inverting armature modifier influence the armature vertex group options only apply to Multi-Modifier, rename and edit the UI to make this clear.
2010-11-19 03:09:51 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_hook(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Hook modifier.
2009-01-02 02:37:54 +00:00
PropertyRNA *prop;
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
FunctionRNA *func;
PropertyRNA *parm;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "HookModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(
srna, "Hook Modifier", "Hook modifier to modify the location of vertices");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "HookModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_HOOK);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_FACTOR);
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
RNA_def_property_float_sdna(prop, NULL, "force");
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_text(prop, "Strength", "Relative force of the hook");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, modifier_warp_falloff_items); /* share the enum */
RNA_def_property_ui_text(prop, "Falloff Type", "");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
prop = RNA_def_property(srna, "falloff_radius", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "falloff");
Added RNA for Hook modifier.
2009-01-02 02:37:54 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 100, 100, 2);
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
RNA_def_property_ui_text(
prop, "Radius", "If not zero, the distance from the hook where influence ends");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
prop = RNA_def_property(srna, "falloff_curve", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "curfalloff");
UI/Python: rename Lamps to Lights, to follow more standard terminology. Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-06-27 14:41:53 +02:00
RNA_def_property_ui_text(prop, "Falloff Curve", "Custom falloff curve");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
prop = RNA_def_property(srna, "center", PROP_FLOAT, PROP_TRANSLATION);
RNA: Expose hook centre D529 by Gottfried Hofmann
2014-06-20 02:20:23 +10:00
RNA_def_property_float_sdna(prop, NULL, "cent");
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
RNA_def_property_ui_text(
prop, "Hook Center", "Center of the hook, used for falloff and display");
RNA: Expose hook centre D529 by Gottfried Hofmann
2014-06-20 02:20:23 +10:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Expose hook inverse matrix Needed so scripts don't need to use operators to adjust hook modifiers.
2016-06-23 11:52:22 +10:00
prop = RNA_def_property(srna, "matrix_inverse", PROP_FLOAT, PROP_MATRIX);
RNA_def_property_float_sdna(prop, NULL, "parentinv");
RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4);
RNA_def_property_ui_text(
prop, "Matrix", "Reverse the transformation between this object and its target");
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
Added RNA for Hook modifier.
2009-01-02 02:37:54 +00:00
RNA_def_property_ui_text(
prop, "Object", "Parent Object for hook, also recalculates and clears offset");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
LibOverride: Fix broken Hook modifier case. Hook modifier uses same kind of parent inverse matrix as regular object parenting, so we need to bypass that matrix re-computation when setting the overridding object here as well. Also cleanup some minor glitches in object parents' override_apply func.
2019-08-27 16:28:41 +02:00
RNA_def_property_override_funcs(prop, NULL, NULL, "rna_HookModifier_object_override_apply");
Fix [#37085] Hook modifier work when created with Ctrl+H, but not when created via modifier panel "transform matrix" of the hook was not inited (reset) when assinging and object to it, now use same code for both OBJECT_OT_hook_reset operator and RNA object assignement. Reviewed by Brecht, thanks.
2013-10-15 14:54:12 +00:00
RNA_def_property_pointer_funcs(prop, NULL, "rna_HookModifier_object_set", NULL, NULL);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "subtarget", PROP_STRING, PROP_NONE);
Hook Modifier - Bone Targets Made Hook Modifier be able to use bone targets. However, I haven't been able to verify that everything will work perfectly, since just creating a new Hook Modifier and assigning targets doesn't set hmd->indexar correctly.
2009-08-21 10:47:27 +00:00
RNA_def_property_string_sdna(prop, NULL, "subtarget");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Sub-Target",
"Name of Parent Bone for hook (if applicable), also recalculates and clears offset");
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_HookModifier_subtarget_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Hook Modifier: add falloff & radius options - Add falloff types & curves (matching warp-modifier) - Add uniform scale option, important when adding hooks to non-uniform scaled objects, especially for use with lattice objects which can't avoid uneven scaling. This uses relative transformation set when the hook is assigned, when measuring the distances.
2015-02-04 07:04:21 +11:00
prop = RNA_def_property(srna, "use_falloff_uniform", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_HOOK_UNIFORM_SPACE);
RNA_def_property_ui_text(prop, "Uniform Falloff", "Compensate for non-uniform object scale");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Hook modifier.
2009-01-02 02:37:54 +00:00
RNA_def_property_string_sdna(prop, NULL, "name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_HookModifier_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA: provide access to the vertex index array of the Hook modifier. This allows creating hooks completely without the use of operators. Also fix subtarget to actually recompute the inverse matrix. In order to follow the vertex_indices_set function naming convention, it is necessary to fix makesrna to avoid a naming conflict between the function wrapper and the property accessor by adding a tag. Differential Revision: https://developer.blender.org/D4798
2019-05-04 20:10:43 +03:00
prop = RNA_def_property(srna, "vertex_indices", PROP_INT, PROP_UNSIGNED);
RNA_def_property_array(prop, RNA_MAX_ARRAY_LENGTH);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_dynamic_array_funcs(prop, "rna_HookModifier_vertex_indices_get_length");
RNA_def_property_int_funcs(prop, "rna_HookModifier_vertex_indices_get", NULL, NULL);
RNA_def_property_ui_text(prop,
"Vertex Indices",
"Indices of vertices bound to the modifier. For bezier curves, "
"handles count as additional vertices");
func = RNA_def_function(srna, "vertex_indices_set", "rna_HookModifier_vertex_indices_set");
RNA_def_function_ui_description(
func, "Validates and assigns the array of vertex indices bound to the modifier");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
parm = RNA_def_int_array(
func, "indices", 1, NULL, INT_MIN, INT_MAX, "", "Vertex Indices", 0, INT_MAX);
RNA_def_property_array(parm, RNA_MAX_ARRAY_LENGTH);
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
Modifiers: Hook Modifier add invert vgroup option Adds the invert group optin to the hook modifier. Differential Revision: https://developer.blender.org/D6817
2020-02-12 10:34:35 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_HOOK_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_softbody(BlenderRNA *brna)
{
StructRNA *srna;
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SoftBodyModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Soft Body Modifier", "Soft body simulation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "SoftbodyModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SOFT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_property_struct_type(prop, "SoftBodySettings");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_SoftBodyModifier_settings_get", NULL, NULL, NULL);
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_property_ui_text(prop, "Soft Body Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
Softbody now uses the new pointcache code. Note: Rna access to softbody point cache is through softbody modifier although the point cache is in softbody settings. This is to make it similar to cloth. Bugfix: Softbody rna was trying to get "ob->soft->softflag" instead of the correct "ob->softflag".
2009-08-02 19:39:33 +00:00
RNA_def_property_struct_type(prop, "PointCache");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_SoftBodyModifier_point_cache_get", NULL, NULL, NULL);
Softbody now uses the new pointcache code. Note: Rna access to softbody point cache is through softbody modifier although the point cache is in softbody settings. This is to make it similar to cloth. Bugfix: Softbody rna was trying to get "ob->soft->softflag" instead of the correct "ob->softflag".
2009-08-02 19:39:33 +00:00
RNA_def_property_ui_text(prop, "Soft Body Point Cache", "");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_boolean(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Apply patch D8816, from Zachary(AFWS) for collection boolean operand. Also added code so that exact solver does the whole collection at once. This patch allows users to use a collection (as an alternative to Object) for the boolean modifier operand, and therefore get rid of a long modifier stack.
2020-09-13 16:57:27 -04:00
static const EnumPropertyItem prop_operand_items[] = {
{eBooleanModifierFlag_Object,
"OBJECT",
0,
"Object",
"Use a mesh object as the operand for the Boolean operation"},
{eBooleanModifierFlag_Collection,
"COLLECTION",
0,
"Collection",
"Use a collection of mesh objects as the operand for the Boolean operation"},
{0, NULL, 0, NULL, NULL},
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_operation_items[] = {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{eBooleanModifierOp_Intersect,
"INTERSECT",
0,
"Intersect",
Apply patch D8816, from Zachary(AFWS) for collection boolean operand. Also added code so that exact solver does the whole collection at once. This patch allows users to use a collection (as an alternative to Object) for the boolean modifier operand, and therefore get rid of a long modifier stack.
2020-09-13 16:57:27 -04:00
"Keep the part of the mesh that is common between all operands"},
{eBooleanModifierOp_Union, "UNION", 0, "Union", "Combine meshes in an additive way"},
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
{eBooleanModifierOp_Difference,
"DIFFERENCE",
0,
"Difference",
Apply patch D8816, from Zachary(AFWS) for collection boolean operand. Also added code so that exact solver does the whole collection at once. This patch allows users to use a collection (as an alternative to Object) for the boolean modifier operand, and therefore get rid of a long modifier stack.
2020-09-13 16:57:27 -04:00
"Combine meshes in a subtractive way"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge newboolean branch into master. This is for design task T67744, Boolean Redesign. It adds a choice of solver to the Boolean modifier and the Intersect (Boolean) and Intersect (Knife) tools. The 'Fast' choice is the current Bmesh boolean. The new 'Exact' choice is a more advanced algorithm that supports overlapping geometry and uses more robust calculations, but is slower than the Fast choice. The default with this commit is set to 'Exact'. We can decide before the 2.91 release whether or not this is the right choice, but this choice now will get us more testing and feedback on the new code.
2020-08-28 10:56:44 -04:00
static const EnumPropertyItem prop_solver_items[] = {
{eBooleanModifierSolver_Fast,
"FAST",
0,
"Fast",
"Simple solver for the best performance, without support for overlapping geometry"},
{eBooleanModifierSolver_Exact, "EXACT", 0, "Exact", "Advanced solver for the best result"},
{0, NULL, 0, NULL, NULL},
};
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "BooleanModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Boolean Modifier", "Boolean operations modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "BooleanModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_BOOLEAN);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
Great patch by Harley Acheson fixing about 80 typos and spelling mistakes in makesrna
2010-05-04 05:15:53 +00:00
RNA_def_property_ui_text(prop, "Object", "Mesh object to use for Boolean operation");
Bugfix #26748 Boolean modifier should be restricted to Mesh objects only.
2011-04-07 13:14:08 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_BooleanModifier_object_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Apply patch D8816, from Zachary(AFWS) for collection boolean operand. Also added code so that exact solver does the whole collection at once. This patch allows users to use a collection (as an alternative to Object) for the boolean modifier operand, and therefore get rid of a long modifier stack.
2020-09-13 16:57:27 -04:00
prop = RNA_def_property(srna, "collection", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "collection");
RNA_def_property_struct_type(prop, "Collection");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT);
RNA_def_property_ui_text(
prop, "Collection", "Use mesh objects in this collection for Boolean operation");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "operation", PROP_ENUM, PROP_NONE);
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
RNA_def_property_enum_items(prop, prop_operation_items);
Modifiers: Make Difference default operation for boolean modifier. Make Difference a default value for boolean modifier operation property. Currently operation property of the boolean modifier is set to Intersect, which is the least frequently used boolean operation of the three available. It is also goes out of sync with Intersect (Boolean) tool, where Difference is a default operation. Reviewers: mont29, brecht, sergey Reviewed By: mont29, brecht, sergey Subscribers: mont29, brecht, campbellbarton, sergey, billreynish Tags: #modifiers Differential Revision: https://developer.blender.org/D4340
2019-02-12 13:51:33 +01:00
RNA_def_property_enum_default(prop, eBooleanModifierOp_Difference);
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
RNA_def_property_ui_text(prop, "Operation", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Apply patch D8816, from Zachary(AFWS) for collection boolean operand. Also added code so that exact solver does the whole collection at once. This patch allows users to use a collection (as an alternative to Object) for the boolean modifier operand, and therefore get rid of a long modifier stack.
2020-09-13 16:57:27 -04:00
prop = RNA_def_property(srna, "operand_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_operand_items);
RNA_def_property_ui_text(prop, "Operand Type", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Boolean Modifier: Add back BMesh option There are still issues with overlapping geometry, however some of the issues reported are are causing problems, or fail entirely with Carve too.
2016-07-13 17:45:55 +10:00
prop = RNA_def_property(srna, "double_threshold", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "double_threshold");
BMesh: Add option to use BMesh boolean modifier This uses a bmesh-intersection, BLI_kdtree and watertight intersections to perform boolean operations. For now keep both BMesh and Carve booleans usable at once for testing & bug reports, however we plan to phase out Carve by next release.
2015-12-11 20:24:39 +11:00
RNA_def_property_range(prop, 0, 1.0f);
Fix (irc-reported by @sergey) invalid precision value in a float RNA property. Maximum allowed UI float precision value is 6 (which means 7 digits). Will change code checking on that in next commit.
2017-09-18 19:18:02 +02:00
RNA_def_property_ui_range(prop, 0, 1, 0.0001, 6);
Boolean Modifier: Add back BMesh option There are still issues with overlapping geometry, however some of the issues reported are are causing problems, or fail entirely with Carve too.
2016-07-13 17:45:55 +10:00
RNA_def_property_ui_text(
prop, "Overlap Threshold", "Threshold for checking overlapping geometry");
BMesh: Add option to use BMesh boolean modifier This uses a bmesh-intersection, BLI_kdtree and watertight intersections to perform boolean operations. For now keep both BMesh and Carve booleans usable at once for testing & bug reports, however we plan to phase out Carve by next release.
2015-12-11 20:24:39 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge newboolean branch into master. This is for design task T67744, Boolean Redesign. It adds a choice of solver to the Boolean modifier and the Intersect (Boolean) and Intersect (Knife) tools. The 'Fast' choice is the current Bmesh boolean. The new 'Exact' choice is a more advanced algorithm that supports overlapping geometry and uses more robust calculations, but is slower than the Fast choice. The default with this commit is set to 'Exact'. We can decide before the 2.91 release whether or not this is the right choice, but this choice now will get us more testing and feedback on the new code.
2020-08-28 10:56:44 -04:00
prop = RNA_def_property(srna, "solver", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_solver_items);
RNA_def_property_enum_default(prop, eBooleanModifierSolver_Exact);
RNA_def_property_ui_text(prop, "Solver", "Method for calculating booleans");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Add a Self option to the Exact boolean modifier. Fixes T52425. With this option, self-intersections in either or both operands will be handled properly (if both sides are piecewise winding number constant, and maybe some other cases too). In the Boolean tool, this flag was there already but the code forced a unary operation in that case; this commit corrects it to make a binary operation. This flag makes the code slower, which is why it is an option and not an always-on thing.
2020-09-07 14:26:00 -04:00
prop = RNA_def_property(srna, "use_self", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", eBooleanModifierFlag_Self);
RNA_def_property_ui_text(prop, "Self", "Allow self-intersection in operands");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Boolean Modifier: add debug options Only show & use when running in debug mode.
2017-09-19 18:29:52 +10:00
/* BMesh debugging options, only used when G_DEBUG is set */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Boolean Modifier: add debug options Only show & use when running in debug mode.
2017-09-19 18:29:52 +10:00
/* BMesh intersection options */
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem debug_items[] = {
Boolean Modifier: add debug options Only show & use when running in debug mode.
2017-09-19 18:29:52 +10:00
{eBooleanModifierBMeshFlag_BMesh_Separate, "SEPARATE", 0, "Separate", ""},
Fix i18n messages extraction script, and a few more UI messages...
2017-10-04 12:38:40 +02:00
{eBooleanModifierBMeshFlag_BMesh_NoDissolve, "NO_DISSOLVE", 0, "No Dissolve", ""},
{eBooleanModifierBMeshFlag_BMesh_NoConnectRegions,
"NO_CONNECT_REGIONS",
0,
"No Connect Regions",
""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Boolean Modifier: add debug options Only show & use when running in debug mode.
2017-09-19 18:29:52 +10:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Boolean Modifier: add debug options Only show & use when running in debug mode.
2017-09-19 18:29:52 +10:00
prop = RNA_def_property(srna, "debug_options", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, debug_items);
RNA_def_property_enum_sdna(prop, NULL, "bm_flag");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_ui_text(prop, "Debug", "Debugging options, only when started with '-d'");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_array(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_fit_type_items[] = {
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
{MOD_ARR_FIXEDCOUNT,
"FIXED_COUNT",
0,
"Fixed Count",
"Duplicate the object a certain number of times"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_ARR_FITLENGTH,
"FIT_LENGTH",
0,
"Fit Length",
"Duplicate the object as many times as fits in a certain length"},
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
{MOD_ARR_FITCURVE, "FIT_CURVE", 0, "Fit Curve", "Fit the duplicated objects to a curve"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ArrayModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Array Modifier", "Array duplication modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ArrayModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_ARRAY);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
/* Length parameters */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "fit_type", PROP_ENUM, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_enum_items(prop, prop_fit_type_items);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Fit Type", "Array length calculation method");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "count", PROP_INT, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_range(prop, 1, INT_MAX);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 1000, 1, -1);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Count", "Number of duplicates to make");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "fit_length", PROP_FLOAT, PROP_DISTANCE);
rna renaming (manual edits)
2010-08-21 04:51:00 +00:00
RNA_def_property_float_sdna(prop, NULL, "length");
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_ui_range(prop, 0, 10000, 10, 2);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Length", "Length to fit array within");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "curve", PROP_POINTER, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "curve_ob");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Curve", "Curve object to fit array length to");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ArrayModifier_curve_ob_set", NULL, "rna_Curve_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Fix T42952: Curve modifier not taken into account when curve is created from mesh Curve and array modifiers requires curve path to be evaluated, dependency graph will make sure that curve eval would create such a path, but if curve was already evaluated we might miss path. So what we do now is: if path was not calculated for target curve we tag it for update.
2014-12-22 19:02:47 +05:00
RNA_def_property_update(prop, 0, "rna_ArrayModifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
/* Offset parameters */
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
prop = RNA_def_property(srna, "use_constant_offset", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_CONST);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
RNA_def_property_ui_text(prop, "Constant Offset", "Add a constant offset");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "constant_offset_displace", PROP_FLOAT, PROP_TRANSLATION);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_float_sdna(prop, NULL, "offset");
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(
prop, "Constant Offset Displacement", "Value for the distance between arrayed items");
Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws. use the same precision for location all over (2-5 was used), use define as 5. also disallow boolean to have any subtype besides PROP_LAYER_MEMBER, some booleans had TRANSLATION / XYZ subtypes which don't make sense.
2012-04-10 08:33:30 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_RELATIVE);
Added missing/better tooltips for Array modifier
2010-04-16 22:42:35 +00:00
RNA_def_property_ui_text(
prop, "Relative Offset", "Add an offset relative to the object's bounding box");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
/* PROP_TRANSLATION causes units to be used which we don't want */
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
prop = RNA_def_property(srna, "relative_offset_displace", PROP_FLOAT, PROP_XYZ);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_float_sdna(prop, NULL, "scale");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Relative Offset Displacement",
"The size of the geometry will determine the distance between arrayed items");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
/* Vertex merging parameters */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_merge_vertices", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices in adjacent duplicates");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_merge_vertices_cap", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGEFINAL);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(
prop, "Merge End Vertices", "Merge vertices in first and last duplicates");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_float_sdna(prop, NULL, "merge_dist");
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 1, 1, 4);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
/* Offset object */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_OBJ);
Added missing/better tooltips for Array modifier
2010-04-16 22:42:35 +00:00
RNA_def_property_ui_text(
prop, "Object Offset", "Add another object's transformation to the total offset");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "offset_object", PROP_POINTER, PROP_NONE);
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "offset_ob");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Object Offset",
"Use the location and rotation of another object to determine the distance and "
"rotational change between arrayed items");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added RNA for the Array modifier.
2009-01-02 04:45:13 +00:00
/* Caps */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "start_cap", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Start Cap", "Mesh object to use as a start cap");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ArrayModifier_start_cap_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Fix: Array modifier start cap not updating with object changes When setting the start cap of the array modifier it does not update when updating the start cap objects geometry. This patch switches the property update to rna_Modifier_dependency_update, the same as the end cap which works properly. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D7584
2020-05-29 17:55:13 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "end_cap", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "End Cap", "Mesh object to use as an end cap");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ArrayModifier_end_cap_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Array Modifier: option to offset UV's D2912 by @Zuorion
2017-12-07 04:33:52 +11:00
prop = RNA_def_property(srna, "offset_u", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset[0]");
RNA_def_property_range(prop, -1, 1);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
RNA_def_property_ui_text(prop, "U Offset", "Amount to offset array UVs on the U axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Array Modifier: option to offset UV's D2912 by @Zuorion
2017-12-07 04:33:52 +11:00
prop = RNA_def_property(srna, "offset_v", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "uv_offset[1]");
RNA_def_property_range(prop, -1, 1);
RNA_def_property_ui_range(prop, -1, 1, 2, 4);
RNA_def_property_ui_text(prop, "V Offset", "Amount to offset array UVs on the V axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_edgesplit(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "EdgeSplitModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(
srna, "EdgeSplit Modifier", "Edge splitting modifier to create sharp edges");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "EdgeSplitModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE);
Cleanup: Internal degrees removal. This patch changes most of the reamining degrees usage in internal code into radians. I let a few which I know off asside, for reasons explained below - and I'm not sure to have found out all of them. WARNING: this introduces forward incompatibility, which means files saved from this version won't open 100% correctly in previous versions (a few angle properties would use radians values as degrees...). Details: - Data: -- Lamp.spotsize: Game engine exposed this setting in degrees, to not break the API here I kept it as such (using getter/setter functions), still using radians internally. -- Mesh.smoothresh: Didn't touch to this one, as we will hopefully replace it completely by loop normals currently in dev. - Modifiers: -- EdgeSplitModifierData.split_angle, BevelModifierData.bevel_angle: Done. - Postprocessing: -- WipeVars.angle (sequencer's effect), NodeBokehImage.angle, NodeBoxMask.rotation, NodeEllipseMask.rotation: Done. - BGE: -- bConstraintActuator: Orientation type done (the minloc[0] & maxloc[0] cases). Did not touch to 'limit location' type, it can also limit rotation, but it exposes through RNA the same limit_min/limit_max, which hence can be either distance or angle values, depending on the mode. Will leave this to BGE team. -- bSoundActuator.cone_outer_angle_3d, bSoundActuator.cone_inner_angle_3d: Done (note I kept degrees in BGE itself, as it seems this is the expected value here...). -- bRadarSensor.angle: Done. Reviewers: brecht, campbellbarton, sergey, gaiaclary, dfelinto, moguri, jbakker, lukastoenne, howardt Reviewed By: brecht, campbellbarton, sergey, gaiaclary, moguri, jbakker, lukastoenne, howardt Thanks to all! Differential Revision: http://developer.blender.org/D59
2013-12-03 20:09:25 +01:00
RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f));
Fix T46134: units degrees increment are too small The user interface was ignoring the precision step size for degrees, making all rotation inputs drag by a 100th of a degree. Now use a 10th of a degree instead.
2015-09-17 21:50:40 +10:00
RNA_def_property_ui_range(prop, 0.0f, DEG2RADF(180.0f), 10, 2);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Split Angle", "Angle above which to split edges");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_edge_angle", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_EDGESPLIT_FROMANGLE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Use Edge Angle", "Split edges with high angle between faces");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_edge_sharp", PROP_BOOLEAN, PROP_NONE);
Added RNA for the Boolean and EdgeSplit modifiers.
2009-01-02 03:38:15 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_EDGESPLIT_FROMFLAG);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Use Sharp Edges", "Split edges that are marked as sharp");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_displace(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the Displace modifier. Once again, not sure how to handle uvlayer.
2009-01-02 05:20:44 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_direction_items[] = {
A bunch of fixes and tweaks in RNA messages, found while translating them in french...
2011-11-26 12:30:01 +00:00
{MOD_DISP_DIR_X,
"X",
0,
"X",
"Use the texture's intensity value to displace in the X direction"},
{MOD_DISP_DIR_Y,
"Y",
0,
"Y",
"Use the texture's intensity value to displace in the Y direction"},
{MOD_DISP_DIR_Z,
"Z",
0,
"Z",
"Use the texture's intensity value to displace in the Z direction"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_DISP_DIR_NOR,
"NORMAL",
0,
"Normal",
Displace Modifier: add an option to displace along (averaged) custom normals, instead of vertex normals. User suggestion/request from 'boby'.
2015-08-12 18:21:41 +02:00
"Use the texture's intensity value to displace along the vertex normal"},
{MOD_DISP_DIR_CLNOR,
"CUSTOM_NORMAL",
0,
"Custom Normal",
"Use the texture's intensity value to displace along the (averaged) custom normal (falls "
"back to vertex)"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_DISP_DIR_RGB_XYZ,
Displace Modifier: add an option to displace along (averaged) custom normals, instead of vertex normals. User suggestion/request from 'boby'.
2015-08-12 18:21:41 +02:00
"RGB_TO_XYZ",
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
0,
"RGB to XYZ",
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
"Use the texture's RGB values to displace the mesh in the XYZ direction"},
{0, NULL, 0, NULL, NULL},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_space_items[] = {
Displace modifier: add global/local space option for X/Y/Z/XYZ directions. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2309
2016-10-23 14:04:27 +02:00
{MOD_DISP_SPACE_LOCAL, "LOCAL", 0, "Local", "Direction is defined in local coordinates"},
{MOD_DISP_SPACE_GLOBAL, "GLOBAL", 0, "Global", "Direction is defined in global coordinates"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Displace modifier: add global/local space option for X/Y/Z/XYZ directions. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2309
2016-10-23 14:04:27 +02:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "DisplaceModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Displace Modifier", "Displacement modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "DisplaceModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_DISPLACE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for the Displace modifier. Once again, not sure how to handle uvlayer.
2009-01-02 05:20:44 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DisplaceModifier_defgrp_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
displace modifier incorrectly had mid-level set as a 'distance' subtyped property. also change the minimum texture contrast to 0.0 (was 0.01).
2013-01-14 20:27:25 +00:00
prop = RNA_def_property(srna, "mid_level", PROP_FLOAT, PROP_FACTOR);
rna data path names which are more likely to break animations. Added an operator "Update Animation Data", access from the search menu to update drivers and fcurves.
2010-08-20 06:09:58 +00:00
RNA_def_property_float_sdna(prop, NULL, "midlevel");
Remove artificial limit, now HDR textures can be used to displace.
2011-05-16 11:46:16 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Added RNA for the Displace modifier. Once again, not sure how to handle uvlayer.
2009-01-02 05:20:44 +00:00
RNA_def_property_ui_range(prop, 0, 1, 10, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Midlevel", "Material value that gives no displacement");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fix #23210: displace modifier strength only had 2 decimal places, was inconsistent.
2010-08-06 18:14:52 +00:00
RNA_def_property_ui_range(prop, -100, 100, 10, 3);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Strength", "Amount to displace geometry");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "direction", PROP_ENUM, PROP_NONE);
Added RNA for the Displace modifier. Once again, not sure how to handle uvlayer.
2009-01-02 05:20:44 +00:00
RNA_def_property_enum_items(prop, prop_direction_items);
RNA_def_property_ui_text(prop, "Direction", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Displace modifier: add global/local space option for X/Y/Z/XYZ directions. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2309
2016-10-23 14:04:27 +02:00
prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_space_items);
RNA_def_property_ui_text(prop, "Space", "");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Displace Modifier add invert vgroup option Adds the invert vertex weights option to the Displace modifier. Adds a flag and char padding to the Displace modifier DNA for the invert group boolean. Differential Revision: https://developer.blender.org/D6686
2020-02-03 11:55:29 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DISP_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
rna_def_modifier_generic_map_info(srna);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_uvproject(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "UVProjectModifier", "Modifier");
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_struct_ui_text(
srna, "UV Project Modifier", "UV projection modifier to set UVs from a projector");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "UVProjectModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_UVPROJECT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, by Gaia Clary. Rationale: the name was confusing and not always used consistently, and this map itself is not something that can be layered, rather the map can be used as texture coordinates in some layered setup. The original intent was to indicate this contained more than just UV's, but the game engine settings have already been moved out, and apparently users didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
RNA_def_property_ui_text(prop, "UV Map", "UV map name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVProjectModifier_uvlayer_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "projector_count", PROP_INT, PROP_NONE);
rna data path names which are more likely to break animations. Added an operator "Update Animation Data", access from the search menu to update drivers and fcurves.
2010-08-20 06:09:58 +00:00
RNA_def_property_int_sdna(prop, NULL, "num_projectors");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Number of Projectors", "Number of projectors to use");
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
RNA_def_property_int_funcs(prop, NULL, "rna_UVProjectModifier_num_projectors_set", NULL);
Cleanup! Also fixed a nasty (but inofensive for now) stuff, we had both MOD_UVPROJECT_MAX and MOD_UVPROJECT_MAXPROJECTORS (the former used in RNA code, the later in modifier code)! Kept MOD_UVPROJECT_MAXPROJECTORS.
2013-09-01 21:49:35 +00:00
RNA_def_property_range(prop, 1, MOD_UVPROJECT_MAXPROJECTORS);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "projectors", PROP_COLLECTION, PROP_NONE);
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
RNA_def_property_struct_type(prop, "UVProjector");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_collection_funcs(prop,
"rna_UVProject_projectors_begin",
"rna_iterator_array_next",
"rna_iterator_array_end",
"rna_iterator_array_get",
NULL,
NULL,
NULL,
NULL);
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
RNA_def_property_ui_text(prop, "Projectors", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "aspect_x", PROP_FLOAT, PROP_NONE);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_float_sdna(prop, NULL, "aspectx");
UI: use proportional option while dragging buttons
2014-02-09 08:42:45 +11:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_range(prop, 1, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 1, 1000, 1, 3);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_ui_text(prop, "Horizontal Aspect Ratio", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "aspect_y", PROP_FLOAT, PROP_NONE);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_float_sdna(prop, NULL, "aspecty");
UI: use proportional option while dragging buttons
2014-02-09 08:42:45 +11:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_range(prop, 1, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 1, 1000, 1, 3);
Added RNA for the UVProject modifier. Had a couple problems with this one; the uv layer and the projectors. The projectors in particular is confusing; I figured this would be one of the cases handled by RNA automagically, but maybe I need to define custom functions for it? Anyway, marked the code with XXX.
2009-01-02 07:29:35 +00:00
RNA_def_property_ui_text(prop, "Vertical Aspect Ratio", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "scale_x", PROP_FLOAT, PROP_NONE);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_float_sdna(prop, NULL, "scalex");
UI: use proportional option while dragging buttons
2014-02-09 08:42:45 +11:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 0, 1000, 1, 3);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_ui_text(prop, "Horizontal Scale", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "scale_y", PROP_FLOAT, PROP_NONE);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_float_sdna(prop, NULL, "scaley");
UI: use proportional option while dragging buttons
2014-02-09 08:42:45 +11:00
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 0, 1000, 1, 3);
* Multiply for panorama cameras * Some cases of struct name being set where it shouldnt have been. * Spelling: wich --> which * Copy and initialize uv modifier scale, remove unneeded enum. * Ability to pin any object into the context. * Update uv window while transforming (useful when used with UVProject modifier) * Patch by Wahooney, so new template's are internal text and dont get saved over by mistake. * Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186 Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted by Jochen Schmitt. * [#21816] bpy.data.add_image has stopped working on Windows. moved to bpy.data.images.load(), missed this call. (commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
2010-03-30 12:15:16 +00:00
RNA_def_property_ui_text(prop, "Vertical Scale", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "UVProjector", NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "UVProjector", "UV projector used by the UV project modifier");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
2.5: Modifiers & Menus * Popup menus now remember the last clicked item again. * Modifier and File Format menus are now organized in multiple columns with categories. * Hook, explode, uv project modifiers have all their buttons again with the relevant operators implemented. * Modifiers that can't be added by the user, or don't work on curves for example, are not in the menu anymore. * Fix search menu overlapping buttons when near the bottom of the screen. * Fix uv layers search menu not working in some modifiers. * Cleanup popup menu code a bit, layout engine is used in more cases now instead of ugly position calculation code.
2009-08-21 02:51:56 +00:00
RNA_def_property_struct_type(prop, "Object");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(
prop, "rna_UVProjector_object_get", "rna_UVProjector_object_set", NULL, NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Object to use as projector transform");
bugfix [#23151] UV Project not update in realtime until you save the file and reopen it.
2010-08-02 16:57:46 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_smooth(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SmoothModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Smooth Modifier", "Smoothing effect modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "SmoothModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_X);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "X", "Smooth object along X axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Y);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Y", "Smooth object along Y axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Z);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Z", "Smooth object along Z axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_float_sdna(prop, NULL, "fac");
2.5 RNA: Bugfix: Smooth Modifier didn't accept negative factor values. Patch by Wahooney. Thanks!
2009-06-04 11:05:36 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, -10, 10, 1, 3);
Patch [#27344] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot! Reviewed by Tom Musgrove and myself. From the patch description: ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why. Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
RNA_def_property_ui_text(prop, "Factor", "Strength of modifier effect");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
rna renaming (manual edits)
2010-08-21 04:51:00 +00:00
RNA_def_property_int_sdna(prop, NULL, "repeat");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 30, 1, -1);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_ui_text(prop, "Repeat", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SmoothModifier_defgrp_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Smooth Modifier add invert vgroup option Adds the invert vertex group option to the smooth modifier. Setup same way as previous modifiers. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6745
2020-02-06 11:52:24 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
static void rna_def_modifier_correctivesmooth(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem modifier_smooth_type_items[] = {
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
{MOD_CORRECTIVESMOOTH_SMOOTH_SIMPLE,
"SIMPLE",
0,
"Simple",
"Use the average of adjacent edge-vertices"},
{MOD_CORRECTIVESMOOTH_SMOOTH_LENGTH_WEIGHT,
"LENGTH_WEIGHTED",
0,
"Length Weight",
"Use the average of adjacent edge-vertices weighted by their length"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem modifier_rest_source_items[] = {
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
{MOD_CORRECTIVESMOOTH_RESTSOURCE_ORCO,
"ORCO",
0,
"Original Coords",
UI: use term 'Vertex' instead of 'Vert'
2020-07-22 16:21:33 +10:00
"Use base mesh vertex coords as the rest position"},
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
{MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND,
"BIND",
0,
"Bind Coords",
UI: use term 'Vertex' instead of 'Vert'
2020-07-22 16:21:33 +10:00
"Use bind vertex coords for rest position"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
srna = RNA_def_struct(brna, "CorrectiveSmoothModifier", "Modifier");
RNA_def_struct_ui_text(
srna, "Corrective Smooth Modifier", "Correct distortion caused by deformation");
RNA_def_struct_sdna(srna, "CorrectiveSmoothModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
RNA_def_property_float_sdna(prop, NULL, "lambda");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 3);
RNA_def_property_ui_text(prop, "Lambda Factor", "Smooth factor effect");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "repeat");
RNA_def_property_ui_range(prop, 0, 200, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Corrective Smooth modifier, new Scale parameter When scaling the root bone of a rig to apply a global scale, the corrective smooth modifier results in wrong deformation due to incorrect scaling. The delta calculations are not taking into account any scale value. To fix it, a scale property is added to the modifier, allowing to set manually the scale value for the deltas by simply multiplying the vectors by this value. There is a similar implementation in Maya's Delta Mush deformer. This property can be for example driven by the scale of the root bone of the rig, to dynamically update when the animator scale this bone. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D6622
2020-03-10 12:47:43 +01:00
prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "scale");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, 10.0, 5, 3);
RNA_def_property_ui_text(prop, "Scale", "Compensate for scale applied by other modifiers");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "rest_source", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "rest_source");
RNA_def_property_enum_items(prop, modifier_rest_source_items);
RNA_def_property_ui_text(prop, "Rest Source", "Select the source of rest positions");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_rest_source_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "smooth_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "smooth_type");
RNA_def_property_enum_items(prop, modifier_smooth_type_items);
RNA_def_property_ui_text(prop, "Smooth Type", "Method used for smoothing");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CORRECTIVESMOOTH_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_CorrectiveSmoothModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "is_bind", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop, "Bind current shape", "");
RNA_def_property_boolean_funcs(prop, "rna_CorrectiveSmoothModifier_is_bind_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "use_only_smooth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CORRECTIVESMOOTH_ONLY_SMOOTH);
RNA_def_property_ui_text(
prop, "Only Smooth", "Apply smoothing without reconstructing the surface");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
prop = RNA_def_property(srna, "use_pin_boundary", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CORRECTIVESMOOTH_PIN_BOUNDARY);
RNA_def_property_ui_text(
prop, "Pin Boundaries", "Excludes boundary vertices from being smoothed");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
}
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
static void rna_def_modifier_laplaciansmooth(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
srna = RNA_def_struct(brna, "LaplacianSmoothModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Laplacian Smooth Modifier", "Smoothing effect modifier");
RNA_def_struct_sdna(srna, "LaplacianSmoothModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
prop = RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_X);
RNA_def_property_ui_text(prop, "X", "Smooth object along X axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
prop = RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_Y);
RNA_def_property_ui_text(prop, "Y", "Smooth object along Y axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
prop = RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_Z);
RNA_def_property_ui_text(prop, "Z", "Smooth object along Z axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
reneme volume_preservation -> use_volume_preserve
2012-10-24 11:44:32 +00:00
prop = RNA_def_property(srna, "use_volume_preserve", PROP_BOOLEAN, PROP_NONE);
code cleanup: make bmesh operator names more consistant since python has access to these as input arguments and return values. all output values currently have ".out" suffix, this may go in the future, but for now it makes it clear in C code what are inputs and outputs.
2012-11-20 05:50:19 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_PRESERVE_VOLUME);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_ui_text(prop, "Preserve Volume", "Apply volume preservation after smooth");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Shape enhanced method exaggerates a shape using a Laplacian smoothing operator in the reverse direction. http://wiki.blender.org/index.php/User:Apinzonf/shape_enhanced
2013-01-16 19:38:50 +00:00
prop = RNA_def_property(srna, "use_normalized", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_NORMALIZED);
Usual minor UI messages fixes...
2013-01-21 16:25:25 +00:00
RNA_def_property_ui_text(prop, "Normalized", "Improve and stabilize the enhanced shape");
Shape enhanced method exaggerates a shape using a Laplacian smoothing operator in the reverse direction. http://wiki.blender.org/index.php/User:Apinzonf/shape_enhanced
2013-01-16 19:38:50 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI fixes for Laplacian Smooth (r51578): * Make UI look more like Smooth Modifier. * Don't use RNA property names like "lamb", use a more descriptive one instead.
2012-10-24 11:13:43 +00:00
prop = RNA_def_property(srna, "lambda_factor", PROP_FLOAT, PROP_NONE);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_float_sdna(prop, NULL, "lambda");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fix for [#33959] laplacian smooth gui buggy * Made the property UI range do bigger steps. * Increased default values a bit. If people need extreme small values (0.00001) they can enter that manually.
2013-01-23 14:19:01 +00:00
RNA_def_property_ui_range(prop, -1000.0, 1000.0, 5, 3);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_ui_text(prop, "Lambda Factor", "Smooth factor effect");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI fixes for Laplacian Smooth (r51578): * Make UI look more like Smooth Modifier. * Don't use RNA property names like "lamb", use a more descriptive one instead.
2012-10-24 11:13:43 +00:00
prop = RNA_def_property(srna, "lambda_border", PROP_FLOAT, PROP_NONE);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_float_sdna(prop, NULL, "lambda_border");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fix for [#33959] laplacian smooth gui buggy * Made the property UI range do bigger steps. * Increased default values a bit. If people need extreme small values (0.00001) they can enter that manually.
2013-01-23 14:19:01 +00:00
RNA_def_property_ui_range(prop, -1000.0, 1000.0, 5, 3);
UI fixes for Laplacian Smooth (r51578): * Make UI look more like Smooth Modifier. * Don't use RNA property names like "lamb", use a more descriptive one instead.
2012-10-24 11:13:43 +00:00
RNA_def_property_ui_text(prop, "Lambda Border", "Lambda factor in border");
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "repeat");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 200, 1, -1);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop,
"Vertex Group",
"Name of Vertex Group which determines influence of modifier per point");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_LaplacianSmoothModifier_defgrp_name_set");
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modifiers: Laplacian Smooth modifier add invert vgroup option Adds the invert vgroup option to the Laplacian Smooth modifier. Differential Revision: https://developer.blender.org/D6842
2020-02-18 16:28:02 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANSMOOTH_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
}
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
static void rna_def_modifier_cast(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_cast_type_items[] = {
RNA * Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
2009-06-16 00:52:21 +00:00
{MOD_CAST_TYPE_SPHERE, "SPHERE", 0, "Sphere", ""},
{MOD_CAST_TYPE_CYLINDER, "CYLINDER", 0, "Cylinder", ""},
{MOD_CAST_TYPE_CUBOID, "CUBOID", 0, "Cuboid", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "CastModifier", "Modifier");
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_struct_ui_text(srna, "Cast Modifier", "Modifier to cast to other shapes");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "CastModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_CAST);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "cast_type", PROP_ENUM, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_enum_sdna(prop, NULL, "type");
RNA_def_property_enum_items(prop, prop_cast_type_items);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(prop, "Shape", "Target object shape");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Object",
"Control object: if available, its location determines the center of the effect");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, NULL, "rna_CastModifier_object_set", NULL, NULL);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cast modifier: Add invert vgroup option. Adds the Invert Vertex Group weight option to the Cast modifier. Uses the same setup as similar modifiers invert weight. Adds a boolean invert property next to the vertex group string in the modifier and subtracts the current vertex weight from 1.0f if it is turned on. Differential Revision: https://developer.blender.org/D6671 Minor modifications by @mont29.
2020-01-27 14:03:24 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_X);
RNA_def_property_ui_text(prop, "X", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Y);
RNA_def_property_ui_text(prop, "Y", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Z);
RNA_def_property_ui_text(prop, "Z", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_radius_as_size", PROP_BOOLEAN, PROP_NONE);
2.5 Part 2 of Layout Code Cleanup: * Cleanup of Modifier and Text Data Panels. * Made some small layout tweaks. * Added missing RNA properties for Cast Modifier.
2009-07-28 06:26:10 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_SIZE_FROM_RADIUS);
RNA_def_property_ui_text(
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
prop, "Size from Radius", "Use radius as size of projection shape (0 = auto)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_transform", PROP_BOOLEAN, PROP_NONE);
2.5 Part 2 of Layout Code Cleanup: * Cleanup of Modifier and Text Data Panels. * Made some small layout tweaks. * Added missing RNA properties for Cast Modifier.
2009-07-28 06:26:10 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_USE_OB_TRANSFORM);
RNA_def_property_ui_text(
UI: Fix Capitalization Differential Revision: https://developer.blender.org/D5716
2019-09-20 14:31:24 +02:00
prop, "Use Transform", "Use object transform to control projection shape");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_float_sdna(prop, NULL, "fac");
2.5 RNA: * Found more bugs in factor properties.
2009-06-04 11:16:56 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_ui_range(prop, -10, 10, 5, 2);
RNA_def_property_ui_text(prop, "Factor", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "radius", PROP_FLOAT, PROP_DISTANCE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 0, 100, 5, 2);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Radius",
"Only deform vertices within this distance from the center of the effect "
"(leave as 0 for infinite.)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
* Fixing some UI Increment/Decrement issues, where click on left/right triangle in the button would change a decimal which was not seen in the UI. * Made Decimate slider a percentage slider (as the dna name says percent as well).
2010-08-22 16:44:48 +00:00
RNA_def_property_ui_range(prop, 0, 100, 5, 2);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop, "Size", "Size of projection shape (leave as 0 for auto)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_CastModifier_defgrp_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_meshdeform(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
PropertyRNA *prop;
"Fix" #20225: mesh deform surface modifier problems. This mode was an experiment and turn out to work poorly because it does not preserve rotations, so I've just removed the option now. Alternative is to use a solidify modifier on the cage mesh, which will usually give better results.
2010-04-02 11:39:40 +00:00
# if 0
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_mode_items[] = {
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
{0, "VOLUME", 0, "Volume", "Bind to volume inside cage mesh"},
{1, "SURFACE", 0, "Surface", "Bind to surface of cage mesh"},
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
"Fix" #20225: mesh deform surface modifier problems. This mode was an experiment and turn out to work poorly because it does not preserve rotations, so I've just removed the option now. Alternative is to use a solidify modifier on the cage mesh, which will usually give better results.
2010-04-02 11:39:40 +00:00
# endif
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "MeshDeformModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(
srna, "MeshDeform Modifier", "Mesh deformation modifier to deform with other meshes");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "MeshDeformModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Mesh object to deform with");
RNA: poll functions restricting object types D1100,D1105,D1106 by @lichtwerk
2015-02-19 10:02:51 +11:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_MeshDeformModifier_object_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "is_bound", PROP_BOOLEAN, PROP_NONE);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_boolean_funcs(prop, "rna_MeshDeformModifier_is_bound_get", NULL);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to control cage");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_INVERT_VGROUP);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MeshDeformModifier_defgrp_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "precision", PROP_INT, PROP_NONE);
Added RNA for the MeshDeform, Cast, and Smooth Modifiers. Also some changes to pointer types in other places.
2009-01-02 08:03:20 +00:00
RNA_def_property_int_sdna(prop, NULL, "gridsize");
RNA_def_property_range(prop, 2, 10);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Precision", "The grid size for binding");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_dynamic_bind", PROP_BOOLEAN, PROP_NONE);
2.5 Buttons Modifier: * Converted all modifier to python layout engine. Needs a layout cleanup still. * Removed corresponding C code (brecht: please check) * 2 RNA Modifier fixes * Added initial Mesh panel by William Reynish.
2009-05-21 21:23:36 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_DYNAMIC_BIND);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(prop,
"Dynamic",
"Recompute binding dynamically on top of other deformers "
"(slower and more memory consuming)");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
"Fix" #20225: mesh deform surface modifier problems. This mode was an experiment and turn out to work poorly because it does not preserve rotations, so I've just removed the option now. Alternative is to use a solidify modifier on the cage mesh, which will usually give better results.
2010-04-02 11:39:40 +00:00
# if 0
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
Mesh Deform Modifier * Now support a Surface mode next to the existing Volume mode. This binds the mesh to the cage mesh surface rather than it's volume. * Implemented reusing the bone heat weighting code. * Advantage is that it works for cage meshes that are not volumes and that binding is much faster. * Weak point is that disconnected components of a mesh are not guaranteed to stick together (same problem exists with bone heat weighting). * Bind weights could still be compressed better to use less memory. Example file: http://download.blender.org/ftp/incoming/cloth_mdef_surface.blend
2009-11-28 13:33:17 +00:00
RNA_def_property_enum_items(prop, prop_mode_items);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Mode", "Method of binding vertices are bound to cage mesh");
Mesh Deform Modifier * Now support a Surface mode next to the existing Volume mode. This binds the mesh to the cage mesh surface rather than it's volume. * Implemented reusing the bone heat weighting code. * Advantage is that it works for cage meshes that are not volumes and that binding is much faster. * Weak point is that disconnected components of a mesh are not guaranteed to stick together (same problem exists with bone heat weighting). * Bind weights could still be compressed better to use less memory. Example file: http://download.blender.org/ftp/incoming/cloth_mdef_surface.blend
2009-11-28 13:33:17 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
"Fix" #20225: mesh deform surface modifier problems. This mode was an experiment and turn out to work poorly because it does not preserve rotations, so I've just removed the option now. Alternative is to use a solidify modifier on the cage mesh, which will usually give better results.
2010-04-02 11:39:40 +00:00
# endif
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_particlesystem(BlenderRNA *brna)
{
StructRNA *srna;
Add particle system rna pointer property to the particle system modifier
2010-06-06 08:51:53 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ParticleSystemModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "ParticleSystem Modifier", "Particle system simulation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ParticleSystemModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_PARTICLES);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "particle_system", PROP_POINTER, PROP_NONE);
Add particle system rna pointer property to the particle system modifier
2010-06-06 08:51:53 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "psys");
RNA_def_property_ui_text(prop, "Particle System", "Particle System that this modifier controls");
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_particleinstance(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
static EnumPropertyItem particleinstance_space[] = {
{eParticleInstanceSpace_Local,
"LOCAL",
0,
"Local",
"Use offset from the particle object in the instance object"},
{eParticleInstanceSpace_World,
"WORLD",
0,
"World",
"Use world space offset in the instance object"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ParticleInstanceModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "ParticleInstance Modifier", "Particle system instancing modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ParticleInstanceModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_PARTICLES);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "ob");
RNA: poll functions restricting object types D1100,D1105,D1106 by @lichtwerk
2015-02-19 10:02:51 +11:00
RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Mesh_object_poll");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Object", "Object that has the particle system");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "particle_system_index", PROP_INT, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_int_sdna(prop, NULL, "psys");
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
RNA_def_property_range(prop, 1, SHRT_MAX);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_ui_text(prop, "Particle System Number", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "particle_system", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "ParticleSystem");
RNA_def_property_pointer_funcs(prop,
"rna_ParticleInstanceModifier_particle_system_get",
"rna_ParticleInstanceModifier_particle_system_set",
NULL,
"rna_ParticleInstanceModifier_particle_system_poll");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Particle System", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
A bunch of fun stuff now possible because of new pointcache code: * Baked normal particles can now use the "Path" visualization. * Path "max length" & "abs length" are now history: - New option to set path start & end times + random variation to length. - Much more flexible (and calculated better) than previous options. - This works with parents, children, hair & normal particles unlike old length option. - Only known issue for now is that children from faces don't get calculated correctly when using path start time. * New option "trails" for "halo", "line" and "billboard" visualizations: - Draws user controllable number of particle instances along particles path backwards from current position. - Works with children too for cool/weird visualizations that weren't possible before. * Normal particle children's velocities are now approximated better when needed so that "line" visualization trails will look nice. * New particle instance modifier options: - "path"-option works better and has controllable (max)position along path (with random variation possible). - "keep shape"-option for hair, keyed, or baked particles allows to place the instances to a single point (with random variation possible) along particle path. - "axis" option to make rotation handling better (still not perfect, but will have to do for now). Some fixes & cleanup done along the way: * Random path length didn't work for non-child particles. * Cached & unborn particles weren't reset to emit locations. * Particle numbers weren't drawn in the correct place. * Setting proper render & draw visualizations was lost somewhere when initializing new particle settings. * Changing child mode wasn't working correctly. * Some cleanup & modularization of particle child effector code and particle drawing & rendering code. * Object & group visualizations didn't work. * Child simplification didn't work.
2009-07-04 03:50:12 +00:00
RNA_def_property_enum_sdna(prop, NULL, "axis");
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
A bunch of fun stuff now possible because of new pointcache code: * Baked normal particles can now use the "Path" visualization. * Path "max length" & "abs length" are now history: - New option to set path start & end times + random variation to length. - Much more flexible (and calculated better) than previous options. - This works with parents, children, hair & normal particles unlike old length option. - Only known issue for now is that children from faces don't get calculated correctly when using path start time. * New option "trails" for "halo", "line" and "billboard" visualizations: - Draws user controllable number of particle instances along particles path backwards from current position. - Works with children too for cool/weird visualizations that weren't possible before. * Normal particle children's velocities are now approximated better when needed so that "line" visualization trails will look nice. * New particle instance modifier options: - "path"-option works better and has controllable (max)position along path (with random variation possible). - "keep shape"-option for hair, keyed, or baked particles allows to place the instances to a single point (with random variation possible) along particle path. - "axis" option to make rotation handling better (still not perfect, but will have to do for now). Some fixes & cleanup done along the way: * Random path length didn't work for non-child particles. * Cached & unborn particles weren't reset to emit locations. * Particle numbers weren't drawn in the correct place. * Setting proper render & draw visualizations was lost somewhere when initializing new particle settings. * Changing child mode wasn't working correctly. * Some cleanup & modularization of particle child effector code and particle drawing & rendering code. * Object & group visualizations didn't work. * Child simplification didn't work.
2009-07-04 03:50:12 +00:00
RNA_def_property_ui_text(prop, "Axis", "Pole axis for rotation");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "space");
RNA_def_property_enum_items(prop, particleinstance_space);
RNA_def_property_ui_text(prop, "Space", "Space to use for copying mesh data");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Parents);
Fix T51771: UI Messages: Reserve 'Normal' to its geometric meaning. Using 'Regular' instead for the common meaning, this avoids having to add some i18n context disambiguation...
2019-02-12 21:28:04 +01:00
RNA_def_property_ui_text(prop, "Regular", "Create instances from normal particles");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_children", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Children);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Children", "Create instances from child particles");
I18n disambiguation: setting particles' parent/children appart. Looks like in some languages common generic parent/child relationship does notn apply well to those. Part of T43295.
2019-05-09 10:31:11 +02:00
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_PARTICLESETTINGS);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_path", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Path);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Path", "Create instances along particle paths");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_unborn", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Unborn);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Unborn", "Show instances when particles are unborn");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_alive", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Alive);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Alive", "Show instances when particles are alive");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_dead", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Dead);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dead", "Show instances when particles are dead");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_preserve_shape", PROP_BOOLEAN, PROP_NONE);
A bunch of fun stuff now possible because of new pointcache code: * Baked normal particles can now use the "Path" visualization. * Path "max length" & "abs length" are now history: - New option to set path start & end times + random variation to length. - Much more flexible (and calculated better) than previous options. - This works with parents, children, hair & normal particles unlike old length option. - Only known issue for now is that children from faces don't get calculated correctly when using path start time. * New option "trails" for "halo", "line" and "billboard" visualizations: - Draws user controllable number of particle instances along particles path backwards from current position. - Works with children too for cool/weird visualizations that weren't possible before. * Normal particle children's velocities are now approximated better when needed so that "line" visualization trails will look nice. * New particle instance modifier options: - "path"-option works better and has controllable (max)position along path (with random variation possible). - "keep shape"-option for hair, keyed, or baked particles allows to place the instances to a single point (with random variation possible) along particle path. - "axis" option to make rotation handling better (still not perfect, but will have to do for now). Some fixes & cleanup done along the way: * Random path length didn't work for non-child particles. * Cached & unborn particles weren't reset to emit locations. * Particle numbers weren't drawn in the correct place. * Setting proper render & draw visualizations was lost somewhere when initializing new particle settings. * Changing child mode wasn't working correctly. * Some cleanup & modularization of particle child effector code and particle drawing & rendering code. * Object & group visualizations didn't work. * Child simplification didn't work.
2009-07-04 03:50:12 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_KeepShape);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Keep Shape", "Don't stretch the object");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_size", PROP_BOOLEAN, PROP_NONE);
Added a particle instance modifier option to use particle size.
2009-07-05 12:36:20 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_UseSize);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Size", "Use particle size to scale the instances");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "position", PROP_FLOAT, PROP_NONE);
A bunch of fun stuff now possible because of new pointcache code: * Baked normal particles can now use the "Path" visualization. * Path "max length" & "abs length" are now history: - New option to set path start & end times + random variation to length. - Much more flexible (and calculated better) than previous options. - This works with parents, children, hair & normal particles unlike old length option. - Only known issue for now is that children from faces don't get calculated correctly when using path start time. * New option "trails" for "halo", "line" and "billboard" visualizations: - Draws user controllable number of particle instances along particles path backwards from current position. - Works with children too for cool/weird visualizations that weren't possible before. * Normal particle children's velocities are now approximated better when needed so that "line" visualization trails will look nice. * New particle instance modifier options: - "path"-option works better and has controllable (max)position along path (with random variation possible). - "keep shape"-option for hair, keyed, or baked particles allows to place the instances to a single point (with random variation possible) along particle path. - "axis" option to make rotation handling better (still not perfect, but will have to do for now). Some fixes & cleanup done along the way: * Random path length didn't work for non-child particles. * Cached & unborn particles weren't reset to emit locations. * Particle numbers weren't drawn in the correct place. * Setting proper render & draw visualizations was lost somewhere when initializing new particle settings. * Changing child mode wasn't working correctly. * Some cleanup & modularization of particle child effector code and particle drawing & rendering code. * Object & group visualizations didn't work. * Child simplification didn't work.
2009-07-04 03:50:12 +00:00
RNA_def_property_float_sdna(prop, NULL, "position");
RNA_def_property_range(prop, 0.0, 1.0);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Position", "Position along path");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "random_position", PROP_FLOAT, PROP_NONE);
A bunch of fun stuff now possible because of new pointcache code: * Baked normal particles can now use the "Path" visualization. * Path "max length" & "abs length" are now history: - New option to set path start & end times + random variation to length. - Much more flexible (and calculated better) than previous options. - This works with parents, children, hair & normal particles unlike old length option. - Only known issue for now is that children from faces don't get calculated correctly when using path start time. * New option "trails" for "halo", "line" and "billboard" visualizations: - Draws user controllable number of particle instances along particles path backwards from current position. - Works with children too for cool/weird visualizations that weren't possible before. * Normal particle children's velocities are now approximated better when needed so that "line" visualization trails will look nice. * New particle instance modifier options: - "path"-option works better and has controllable (max)position along path (with random variation possible). - "keep shape"-option for hair, keyed, or baked particles allows to place the instances to a single point (with random variation possible) along particle path. - "axis" option to make rotation handling better (still not perfect, but will have to do for now). Some fixes & cleanup done along the way: * Random path length didn't work for non-child particles. * Cached & unborn particles weren't reset to emit locations. * Particle numbers weren't drawn in the correct place. * Setting proper render & draw visualizations was lost somewhere when initializing new particle settings. * Changing child mode wasn't working correctly. * Some cleanup & modularization of particle child effector code and particle drawing & rendering code. * Object & group visualizations didn't work. * Child simplification didn't work.
2009-07-04 03:50:12 +00:00
RNA_def_property_float_sdna(prop, NULL, "random_position");
RNA_def_property_range(prop, 0.0, 1.0);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Random Position", "Randomize position along path");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "rotation");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_text(prop, "Rotation", "Rotation around path");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "random_rotation", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "random_rotation");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_text(prop, "Random Rotation", "Randomize rotation around path");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "particle_amount", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_text(prop, "Particle Amount", "Amount of particles to use for instancing");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "particle_offset", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_text(prop,
"Particle Offset",
"Relative offset of particles to use for instancing, to avoid overlap "
"of multiple instances");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "index_layer_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "index_layer_name");
RNA_def_property_ui_text(prop, "Index Layer Name", "Custom data layer name for the index");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Port particle instance modifier changes from Gooseberry branch The work is mainly from Lukas Toenne, with some modifications from myself. Includes following obvious changes: - Particle system selection is now name-based, with lookup menu. - Lots of new options to control varieties. Changes comparing to the Gooseberry branch: - Default values and versioning code ensures same behavior as the old modifier. - Custom data layers are coming from vertex color, the modifier does not create arbitrary layers now. The hope is to keep data more manageable, and maybe make it easier to select in the shader later on. This means, values are quantized to 256 values, but it should be enough to get varieties in practice. Reviewers: brecht, campbellbarton Reviewed By: brecht Subscribers: eyecandy Differential Revision: https://developer.blender.org/D3157
2018-04-18 12:14:28 +02:00
prop = RNA_def_property(srna, "value_layer_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "value_layer_name");
RNA_def_property_ui_text(
prop, "Value Layer Name", "Custom data layer name for the randomized value");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_explode(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ExplodeModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(
srna, "Explode Modifier", "Explosion effect modifier based on a particle system");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ExplodeModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_EXPLODE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_string_funcs(prop,
"rna_ExplodeModifier_vgroup_get",
"rna_ExplodeModifier_vgroup_length",
"rna_ExplodeModifier_vgroup_set");
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "protect", PROP_FLOAT, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_text(prop, "Protect", "Clean vertex group edges");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_edge_cut", PROP_BOOLEAN, PROP_NONE);
Fix for [#26133] Explode modifier doesn't care about UVs (Option "split edges") * This is basically a total rewrite of the edge split algorithm. The old one didn't handle tris at all and quads were cut wrong in some cases too with the addition of not handling uv coordinates at all. * This new algorithm uses a flag system to categorize different splits and the identical but rotated cases in a similar way to how marching cubes indexes different cases. * It cuts quads and tris and creates proper uv's for the new faces too. * I also renamed the option to "edge cut" to differentiate if from the edge split modifier and added an option to override a uv-channel in the exploded mesh with particle age as x-coordinate so that the shrapnel can be faded out nicely etc.
2011-02-23 19:29:59 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_EdgeCut);
RNA_def_property_ui_text(prop, "Cut Edges", "Cut face edges for nicer shrapnel");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_unborn", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Unborn);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Unborn", "Show mesh when particles are unborn");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_alive", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Alive);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Alive", "Show mesh when particles are alive");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_dead", PROP_BOOLEAN, PROP_NONE);
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_Dead);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Dead", "Show mesh when particles are dead");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_size", PROP_BOOLEAN, PROP_NONE);
"Fix" for [#21591] Explode modifier bug * The new default particle size is quite small, so exploded pieces didn't match the original pieces * There's now an option to use the particle size (useful for some effects), but it isn't used by default * This commit will change how some old files look (explode modifier and not 1.0 particle size), but the exact old behavior is achieved with the new "size" option
2010-04-06 08:43:52 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_PaSize);
RNA_def_property_ui_text(prop, "Size", "Use particle size for the shrapnel");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "particle_uv", PROP_STRING, PROP_NONE);
Fix for [#26133] Explode modifier doesn't care about UVs (Option "split edges") * This is basically a total rewrite of the edge split algorithm. The old one didn't handle tris at all and quads were cut wrong in some cases too with the addition of not handling uv coordinates at all. * This new algorithm uses a flag system to categorize different splits and the identical but rotated cases in a similar way to how marching cubes indexes different cases. * It cuts quads and tris and creates proper uv's for the new faces too. * I also renamed the option to "edge cut" to differentiate if from the edge split modifier and added an option to override a uv-channel in the exploded mesh with particle age as x-coordinate so that the shrapnel can be faded out nicely etc.
2011-02-23 19:29:59 +00:00
RNA_def_property_string_sdna(prop, NULL, "uvname");
Longer names support for all ID and other object names This commit extends limit of ID and objects to 64 (it means 63 meaning characters and 1 for zero-terminator). CustomData layers names are also extended. Changed DNA structures and all places where length constants were hardcoded. All names which are "generating" from ID block should be limited by MAX_ID_NAME-2, all non-id names now has got own define called MAX_NAME which should be used all over for non-id names to make further name migration stuff easier. All name fields in DNA now have comment with constant which corresponds to hardcoded numeric value which should make it easier to further update this limits or even switch to non-hardcoded values in DNA. Special thanks to Campbell who helped figuring out some issues and helped a lot in finding all cases where hardcoded valued were still used in code. Both of forwards and backwards compatibility is stored with blender versions newer than January 5, 2011. Older versions had issue with placing null-terminator to DNA strings on file load which will lead to some unpredictable behavior or even crashes.
2012-01-11 08:51:06 +00:00
RNA_def_property_string_maxlength(prop, MAX_CUSTOMDATA_LAYER_NAME);
Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, by Gaia Clary. Rationale: the name was confusing and not always used consistently, and this map itself is not something that can be layered, rather the map can be used as texture coordinates in some layered setup. The original intent was to indicate this contained more than just UV's, but the game engine settings have already been moved out, and apparently users didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
RNA_def_property_ui_text(prop, "Particle UV", "UV map to change with particle age");
Fix for [#26133] Explode modifier doesn't care about UVs (Option "split edges") * This is basically a total rewrite of the edge split algorithm. The old one didn't handle tris at all and quads were cut wrong in some cases too with the addition of not handling uv coordinates at all. * This new algorithm uses a flag system to categorize different splits and the identical but rotated cases in a similar way to how marching cubes indexes different cases. * It cuts quads and tris and creates proper uv's for the new faces too. * I also renamed the option to "edge cut" to differentiate if from the edge split modifier and added an option to override a uv-channel in the exploded mesh with particle age as x-coordinate so that the shrapnel can be faded out nicely etc.
2011-02-23 19:29:59 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modifiers: Explode modifier add invert vgroup option Adds the invert vgroup option to the Explode modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6844
2020-02-18 17:03:20 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_cloth(BlenderRNA *brna)
{
StructRNA *srna;
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ClothModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Cloth Modifier", "Cloth simulation modifier");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "ClothModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_CLOTH);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "sim_parms");
RNA_def_property_ui_text(prop, "Cloth Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "collision_settings", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "coll_parms");
RNA_def_property_ui_text(prop, "Cloth Collision Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Basic solver result feedback from the mass-spring (cloth/hair) solver. This returns a general status (success/no-convergence/other) along with basic statistics (min/max/average) for the error value and the number of iterations. It allows some general estimation of the simulation quality and detection of critical settings that could become a problem. Better visualization and extended feedback can follow later.
2014-09-20 21:05:46 +02:00
prop = RNA_def_property(srna, "solver_result", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "ClothSolverResult");
RNA_def_property_pointer_sdna(prop, NULL, "solver_result");
RNA_def_property_ui_text(prop, "Solver Result", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "point_cache", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_ui_text(prop, "Point Cache", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Expose hair grid info in the RNA (read-only); it can be useful for debugging purposes.
2014-10-31 17:10:34 +01:00
prop = RNA_def_property(srna, "hair_grid_min", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "hair_grid_min");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Hair Grid Minimum", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Expose hair grid info in the RNA (read-only); it can be useful for debugging purposes.
2014-10-31 17:10:34 +01:00
prop = RNA_def_property(srna, "hair_grid_max", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "hair_grid_max");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Hair Grid Maximum", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Expose hair grid info in the RNA (read-only); it can be useful for debugging purposes.
2014-10-31 17:10:34 +01:00
prop = RNA_def_property(srna, "hair_grid_resolution", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "hair_grid_res");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Hair Grid Resolution", "");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
static void rna_def_modifier_fluid(BlenderRNA *brna)
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
static const EnumPropertyItem prop_fluid_type_items[] = {
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
{0, "NONE", 0, "None", ""},
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
{MOD_FLUID_TYPE_DOMAIN, "DOMAIN", 0, "Domain", ""},
{MOD_FLUID_TYPE_FLOW, "FLOW", 0, "Flow", "Inflow/Outflow"},
{MOD_FLUID_TYPE_EFFEC, "EFFECTOR", 0, "Effector", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
srna = RNA_def_struct(brna, "FluidModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Fluid Modifier", "Fluid simulation modifier");
RNA_def_struct_sdna(srna, "FluidModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_FLUIDSIM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "domain_settings", PROP_POINTER, PROP_NONE);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "domain");
RNA_def_property_ui_text(prop, "Domain Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "flow_settings", PROP_POINTER, PROP_NONE);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "flow");
RNA_def_property_ui_text(prop, "Flow Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: rename effec -> effector Effector is already used elsewhere for this purpose.
2019-12-17 14:03:46 +11:00
prop = RNA_def_property(srna, "effector_settings", PROP_POINTER, PROP_NONE);
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
RNA_def_property_pointer_sdna(prop, NULL, "effector");
RNA_def_property_ui_text(prop, "Effector Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
prop = RNA_def_property(srna, "fluid_type", PROP_ENUM, PROP_NONE);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
RNA_def_property_enum_sdna(prop, NULL, "type");
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
RNA_def_property_enum_items(prop, prop_fluid_type_items);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
RNA_def_property_ui_text(prop, "Type", "");
Bugfix [#33387] Smoke: Animating Smoke Type from Flow to None crashes blender This property was never intended to be animatable. Workaround: Animate density. TODO for 2.66: Introduce on/off property for flow and collision objects
2012-12-02 19:20:19 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
RNA_def_property_update(prop, 0, "rna_fluid_set_type");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
BF2.5: First commit of smoke code. Not working: a) rendering (since volumterics branch is not merged yet) b) moving collision objects of any kind c) saving of collision objects (because that's what I am working on) d) pointcache e) A bunch of other things I already know of So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00
}
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
static void rna_def_modifier_dynamic_paint(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "DynamicPaintModifier", "Modifier");
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
RNA_def_struct_ui_text(srna, "Dynamic Paint Modifier", "Dynamic Paint modifier");
RNA_def_struct_sdna(srna, "DynamicPaintModifierData");
Dynamic Paint: Committed changes from previous weeks, biggest changes are: * Canvas can now have multiple "surfaces" that each can have specific format, type and settings. * Renewed UI to support this new system. * Aside from old "image sequence" output format, Dynamic Paint can now work on vertex level as well. Currently vertex paint and displace are supported. * Integrated vertex level painting with Point Cache. * Added viewport preview for Point Cache surfaces. Due to massive amount of changes, old Dynamic Paint saves are no longer supported. Also some features are temporarily missing or may not work properly.
2011-06-16 10:41:00 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_DYNAMICPAINT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "canvas_settings", PROP_POINTER, PROP_NONE);
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "canvas");
RNA_def_property_ui_text(prop, "Canvas Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "brush_settings", PROP_POINTER, PROP_NONE);
Dynamic Paint: Committed changes from previous weeks, biggest changes are: * Canvas can now have multiple "surfaces" that each can have specific format, type and settings. * Renewed UI to support this new system. * Aside from old "image sequence" output format, Dynamic Paint can now work on vertex level as well. Currently vertex paint and displace are supported. * Integrated vertex level painting with Point Cache. * Added viewport preview for Point Cache surfaces. Due to massive amount of changes, old Dynamic Paint saves are no longer supported. Also some features are temporarily missing or may not work properly.
2011-06-16 10:41:00 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "brush");
RNA_def_property_ui_text(prop, "Brush Settings", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "ui_type", PROP_ENUM, PROP_NONE);
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_enum_sdna(prop, NULL, "type");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_prop_dynamicpaint_type_items);
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
RNA_def_property_ui_text(prop, "Type", "");
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(false);
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
}
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
static void rna_def_modifier_collision(BlenderRNA *brna)
{
StructRNA *srna;
2.5 RNA: * Started wrapping object force. * Added "absorption" property in Collision Modifier RNA.
2009-06-03 22:19:04 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "CollisionModifier", "Modifier");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_struct_ui_text(srna,
"Collision Modifier",
"Collision modifier defining modifier stack position used for collision");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "CollisionModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_PHYSICS);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_flag(prop, PROP_NEVER_NULL);
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_property_struct_type(prop, "CollisionSettings");
rna pointer poll function, not used yet.
2010-08-03 05:14:59 +00:00
RNA_def_property_pointer_funcs(prop, "rna_CollisionModifier_settings_get", NULL, NULL, NULL);
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_property_ui_text(prop, "Settings", "");
LibOverride: Cleanup: remove useless per-property override flag. now that we have more 'global' ways to control that, we can save us quiet a fwe calls....
2020-06-05 10:55:48 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_bevel(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_limit_method_items[] = {
Operation Dot-Kill finished
2010-02-11 01:11:52 +00:00
{0, "NONE", 0, "None", "Bevel the entire mesh by a constant amount"},
code cleanup: remove deprecated bevel code (unused since 2.64)
2013-07-23 14:28:19 +00:00
{MOD_BEVEL_ANGLE,
"ANGLE",
0,
"Angle",
"Only bevel edges with sharp enough angles between faces"},
{MOD_BEVEL_WEIGHT,
"WEIGHT",
0,
"Weight",
Enable new bevel tool code in bevel modifier. Now modifier takes a segments parameter. Bevel edge weights will multiply the overall amount. For vertex-only, you can give a vertex group name, and the weights in that will multiply the overall amount.
2013-02-21 17:29:35 +00:00
"Use bevel weights to determine how much bevel is applied in edge mode"},
code cleanup: remove deprecated bevel code (unused since 2.64)
2013-07-23 14:28:19 +00:00
{MOD_BEVEL_VGROUP,
"VGROUP",
0,
"Vertex Group",
Change tooltip text for Vertex Group in Bevel Modifier. Reflects previous commit that now allows this group to control edge bevels too.
2014-01-24 12:52:18 -05:00
"Use vertex group weights to select whether vertex or edge is beveled"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_val_type_items[] = {
Bevel Modifier: add width type and profile control. This adds to the modifier the new controls that have been added to the bevel tool.
2014-01-14 11:00:44 -05:00
{MOD_BEVEL_AMT_OFFSET, "OFFSET", 0, "Offset", "Amount is offset of new edges from original"},
{MOD_BEVEL_AMT_WIDTH, "WIDTH", 0, "Width", "Amount is width of new face"},
{MOD_BEVEL_AMT_DEPTH,
"DEPTH",
0,
"Depth",
"Amount is perpendicular distance from original edge to bevel face"},
{MOD_BEVEL_AMT_PERCENT,
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
"PERCENT",
0,
"Percent",
"Amount is percent of adjacent edge length"},
Bevel: add new 'Absolute' mode for interpreting 'amount' value. This mode is like Percent, but measures absolute distance along adjacent edges instead of a percentage. So, for example, if you use this mode with 2 segments and profile=1, you will see the length that the bevel moves along unbeveled edges between beveled ones will match the value specified. Many users seem to expect this behavior, even though it means the bevel width is uneven, so this option is for them.
2020-06-19 17:56:01 -04:00
{MOD_BEVEL_AMT_ABSOLUTE,
"ABSOLUTE",
0,
"Absolute",
"Amount is absolute distance along adjacent edge"},
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
{0, NULL, 0, NULL, NULL},
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Bevel: Refactor profile type input to use an enum This will allow the easier addition of a constant radius mode in the future and some changes in the UI to mirror the recent similar change from "Only Vertices" to the "Affect" enum.
2020-06-22 22:25:55 -04:00
static const EnumPropertyItem prop_profile_type_items[] = {
{MOD_BEVEL_PROFILE_SUPERELLIPSE,
"SUPERELLIPSE",
0,
"Superellipse",
"The profile can be a concave or convex curve"},
{MOD_BEVEL_PROFILE_CUSTOM,
"CUSTOM",
0,
"Custom",
"The profile can be any arbitrary path between its endpoints"},
{0, NULL, 0, NULL, NULL},
};
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
static EnumPropertyItem prop_harden_normals_items[] = {
Cleanup: indentation, wrapping Mostly functions wrapping args, not confirming to our style guide.
2019-03-15 08:53:22 +11:00
{MOD_BEVEL_FACE_STRENGTH_NONE, "FSTR_NONE", 0, "None", "Do not set face strength"},
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
{MOD_BEVEL_FACE_STRENGTH_NEW, "FSTR_NEW", 0, "New", "Set face strength on new faces only"},
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
{MOD_BEVEL_FACE_STRENGTH_AFFECTED,
"FSTR_AFFECTED",
0,
"Affected",
"Set face strength on new and affected faces only"},
{MOD_BEVEL_FACE_STRENGTH_ALL, "FSTR_ALL", 0, "All", "Set face strength on all faces"},
{0, NULL, 0, NULL, NULL},
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
static const EnumPropertyItem prop_miter_outer_items[] = {
{MOD_BEVEL_MITER_SHARP, "MITER_SHARP", 0, "Sharp", "Outside of miter is sharp"},
{MOD_BEVEL_MITER_PATCH, "MITER_PATCH", 0, "Patch", "Outside of miter is squared-off patch"},
{MOD_BEVEL_MITER_ARC, "MITER_ARC", 0, "Arc", "Outside of miter is arc"},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem prop_miter_inner_items[] = {
{MOD_BEVEL_MITER_SHARP, "MITER_SHARP", 0, "Sharp", "Inside of miter is sharp"},
{MOD_BEVEL_MITER_ARC, "MITER_ARC", 0, "Arc", "Inside of miter is arc"},
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem prop_vmesh_method_items[] = {
{MOD_BEVEL_VMESH_ADJ, "ADJ", 0, "Grid Fill", "Default patterned fill"},
{MOD_BEVEL_VMESH_CUTOFF,
"CUTOFF",
0,
"Cutoff",
"A cut-off at the end of each profile before the intersection"},
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
{0, NULL, 0, NULL, NULL},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
};
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
static const EnumPropertyItem prop_affect_items[] = {
Bevel: Refactor "Vertex Only" to an enum This matches the change that was done to the bevel modifier so that the interface for the modifier, the active tool, and the operator are consistent. This commit extends the refactor to the bmesh implementation too, so that the parameters in the implementation don't stray too far from what is exposed. Tests are adjusted and still pass.
2020-07-21 16:32:00 -04:00
{MOD_BEVEL_AFFECT_VERTICES, "VERTICES", 0, "Vertices", "Affect only vertices"},
{MOD_BEVEL_AFFECT_EDGES, "EDGES", 0, "Edges", "Affect only edges"},
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
{0, NULL, 0, NULL, NULL},
};
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "BevelModifier", "Modifier");
Fix T59151 Bevel modifier has bad input width for percent. The units scaling was inappropriate when the bevel value was to be interpreted as a percent, so added a separate rna property for "Width Percent" and made UI show the width appropriate for current offset_type.
2019-01-07 07:29:54 -05:00
RNA_def_struct_ui_text(
srna, "Bevel Modifier", "Bevel modifier to make edges and vertices more rounded");
RNA_def_struct_sdna(srna, "BevelModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_BEVEL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Units: Fix some property subtypes This commit only contains some of the changes in the diff. Some require more discussion/work. Differential Revision: https://developer.blender.org/D4337
2019-02-19 15:23:46 +01:00
prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_DISTANCE);
Fix T59151 Bevel modifier has bad input width for percent. The units scaling was inappropriate when the bevel value was to be interpreted as a percent, so added a separate rna property for "Width Percent" and made UI show the width appropriate for current offset_type.
2019-01-07 07:29:54 -05:00
RNA_def_property_float_sdna(prop, NULL, "value");
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 0.1, 4);
RNA_def_property_ui_text(prop, "Width", "Bevel amount");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Enable new bevel tool code in bevel modifier. Now modifier takes a segments parameter. Bevel edge weights will multiply the overall amount. For vertex-only, you can give a vertex group name, and the weights in that will multiply the overall amount.
2013-02-21 17:29:35 +00:00
prop = RNA_def_property(srna, "width_pct", PROP_FLOAT, PROP_PERCENTAGE);
RNA_def_property_float_sdna(prop, NULL, "value");
add a distance limit to the shrinkwrap modifiers project mode, it was problematic for vertices to fire rays out and hit some unrelated-far-off geometry which is often not what users want.
2012-11-09 04:20:17 +00:00
RNA_def_property_range(prop, 0, FLT_MAX);
Enable new bevel tool code in bevel modifier. Now modifier takes a segments parameter. Bevel edge weights will multiply the overall amount. For vertex-only, you can give a vertex group name, and the weights in that will multiply the overall amount.
2013-02-21 17:29:35 +00:00
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 5.0, 2);
RNA_def_property_ui_text(prop, "Width Percent", "Bevel amount for percentage method");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "segments", PROP_INT, PROP_NONE);
code cleanup: remove deprecated bevel code (unused since 2.64)
2013-07-23 14:28:19 +00:00
RNA_def_property_int_sdna(prop, NULL, "res");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_range(prop, 1, 100);
RNA_def_property_ui_text(prop, "Segments", "Number of segments for round edges/verts");
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
RNA_def_property_update(prop, 0, "rna_BevelModifier_update_segments");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
prop = RNA_def_property(srna, "affect", PROP_ENUM, PROP_NONE); /* as an enum */
Bevel: Refactor "Vertex Only" to an enum This matches the change that was done to the bevel modifier so that the interface for the modifier, the active tool, and the operator are consistent. This commit extends the refactor to the bmesh implementation too, so that the parameters in the implementation don't stray too far from what is exposed. Tests are adjusted and still pass.
2020-07-21 16:32:00 -04:00
RNA_def_property_enum_sdna(prop, NULL, "affect_type");
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_enum_items(prop, prop_affect_items);
RNA_def_property_ui_text(prop, "Affect", "Affect edges or vertices");
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added RNA for the ParticleInstance, Explode, and Bevel modifiers.
2009-01-02 10:19:58 +00:00
prop = RNA_def_property(srna, "limit_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "lim_flags");
RNA_def_property_enum_items(prop, prop_limit_method_items);
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
RNA_def_property_ui_text(prop, "Limit Method", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_ANGLE);
Cleanup: Internal degrees removal. This patch changes most of the reamining degrees usage in internal code into radians. I let a few which I know off asside, for reasons explained below - and I'm not sure to have found out all of them. WARNING: this introduces forward incompatibility, which means files saved from this version won't open 100% correctly in previous versions (a few angle properties would use radians values as degrees...). Details: - Data: -- Lamp.spotsize: Game engine exposed this setting in degrees, to not break the API here I kept it as such (using getter/setter functions), still using radians internally. -- Mesh.smoothresh: Didn't touch to this one, as we will hopefully replace it completely by loop normals currently in dev. - Modifiers: -- EdgeSplitModifierData.split_angle, BevelModifierData.bevel_angle: Done. - Postprocessing: -- WipeVars.angle (sequencer's effect), NodeBokehImage.angle, NodeBoxMask.rotation, NodeEllipseMask.rotation: Done. - BGE: -- bConstraintActuator: Orientation type done (the minloc[0] & maxloc[0] cases). Did not touch to 'limit location' type, it can also limit rotation, but it exposes through RNA the same limit_min/limit_max, which hence can be either distance or angle values, depending on the mode. Will leave this to BGE team. -- bSoundActuator.cone_outer_angle_3d, bSoundActuator.cone_inner_angle_3d: Done (note I kept degrees in BGE itself, as it seems this is the expected value here...). -- bRadarSensor.angle: Done. Reviewers: brecht, campbellbarton, sergey, gaiaclary, dfelinto, moguri, jbakker, lukastoenne, howardt Reviewed By: brecht, campbellbarton, sergey, gaiaclary, moguri, jbakker, lukastoenne, howardt Thanks to all! Differential Revision: http://developer.blender.org/D59
2013-12-03 20:09:25 +01:00
RNA_def_property_float_sdna(prop, NULL, "bevel_angle");
RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f));
RNA: angle step-sizes were too small These were ignored previously, so it wasn't noticeable.
2015-09-21 09:44:14 +10:00
RNA_def_property_ui_range(prop, 0.0f, DEG2RADF(180.0f), 10, 2);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Angle", "Angle above which to bevel edges");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Enable new bevel tool code in bevel modifier. Now modifier takes a segments parameter. Bevel edge weights will multiply the overall amount. For vertex-only, you can give a vertex group name, and the weights in that will multiply the overall amount.
2013-02-21 17:29:35 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_BevelModifier_defgrp_name_set");
2 new bevel options for the operator and the modifier. * even offset, uses same shell distance method as solidify to give even with beveled faces. * distance offset, this is mostly for compatibility with the modifier in trunk which uses the bevel width as a distance rather then a percentage. at the moment this is awkward for the operator since it makes percent act differently where the 0-1 range doesnt make sense. still need to bring back more options from trunks bevel modifier.
2011-12-13 09:57:19 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Bevel modifier add invert vgroup option Adds the invert vgroup option to the Bevel modifier. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D6845
2020-02-18 18:06:13 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_BEVEL_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
use more rna-constant name for bevel clamping.
2013-04-24 14:14:54 +00:00
prop = RNA_def_property(srna, "use_clamp_overlap", PROP_BOOLEAN, PROP_NONE);
code cleanup: remove deprecated bevel code (unused since 2.64)
2013-07-23 14:28:19 +00:00
RNA_def_property_boolean_negative_sdna(prop, NULL, "flags", MOD_BEVEL_OVERLAP_OK);
use more rna-constant name for bevel clamping.
2013-04-24 14:14:54 +00:00
RNA_def_property_ui_text(prop, "Clamp Overlap", "Clamp the width to avoid overlap");
Fix bug #34611: bevel overlap limit The previous fix limited overlap, but is sometimes too conservative, and artists want way to turn off the limiting, so added 'Allow Overlap' option to modifier.
2013-04-24 12:39:37 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Bevel Modifier: add width type and profile control. This adds to the modifier the new controls that have been added to the bevel tool.
2014-01-14 11:00:44 -05:00
prop = RNA_def_property(srna, "offset_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "val_flags");
RNA_def_property_enum_items(prop, prop_val_type_items);
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
RNA_def_property_ui_text(prop, "Width Type", "What distance Width measures");
Bevel Modifier: add width type and profile control. This adds to the modifier the new controls that have been added to the bevel tool.
2014-01-14 11:00:44 -05:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Bevel: Refactor profile type input to use an enum This will allow the easier addition of a constant radius mode in the future and some changes in the UI to mirror the recent similar change from "Only Vertices" to the "Affect" enum.
2020-06-22 22:25:55 -04:00
prop = RNA_def_property(srna, "profile_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "profile_type");
RNA_def_property_enum_items(prop, prop_profile_type_items);
RNA_def_property_ui_text(
prop, "Profile Type", "The type of shape used to rebuild a beveled section");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Bevel Modifier: add width type and profile control. This adds to the modifier the new controls that have been added to the bevel tool.
2014-01-14 11:00:44 -05:00
prop = RNA_def_property(srna, "profile", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, 1.0f);
Better bevel profile at extreme values of profile. Patch from Richard Erhardt, with some additions & modifications. Changes bevel profile shape parameter so that can get arbitrarily near square profile as parameter -> 1. Adds code to make profile=0 case work, at least for cube corners, so changed hard min of profile parameter to 0 from 0.15.
2017-12-04 09:30:40 -05:00
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 2);
Fix a bunch of UI string issues...
2014-01-15 10:40:28 +01:00
RNA_def_property_ui_text(prop, "Profile", "The profile shape (0.5 = round)");
Bevel Modifier: add width type and profile control. This adds to the modifier the new controls that have been added to the bevel tool.
2014-01-14 11:00:44 -05:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T34664: bevel face material can be set in tool and modifier. Now the bevel tool, modifier, and internal operator have a material slot # parameter that the user can set. If left at default of -1, behavior is as current -- bevel face material is taken from the closest original face (this may be ambiguous). If material slot is >= 0, it gives the material slot index number for the material to use.
2014-07-17 09:20:22 -04:00
prop = RNA_def_property(srna, "material", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "mat");
RNA_def_property_range(prop, -1, SHRT_MAX);
RNA_def_property_ui_text(
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
prop, "Material Index", "Material index of generated faces, -1 for automatic");
Fix T34664: bevel face material can be set in tool and modifier. Now the bevel tool, modifier, and internal operator have a material slot # parameter that the user can set. If left at default of -1, behavior is as current -- bevel face material is taken from the closest original face (this may be ambiguous). If material slot is >= 0, it gives the material slot index number for the material to use.
2014-07-17 09:20:22 -04:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add 'loop slide' option to bevel. See T45260 Current behavior of bevel is to 'loop slide' along unbeveled edges when possible, but this produces uneven bevel widths sometimes, so this option lets user choose between having the loop slide effect or having more even bevel widths. Trying it out with default being 'no loop slide', so different from current behavior. May reverse this choice later, depending on user reactions.
2015-07-05 09:53:17 -04:00
prop = RNA_def_property(srna, "loop_slide", PROP_BOOLEAN, PROP_NONE);
Change default for bevel to match previous behavior. Have reconsidered and feel it best to try matching previous behavior (doing "loop slides" where possible) as default. This will avoid the need to change regression tests, among other things.
2015-07-05 13:31:26 -04:00
RNA_def_property_boolean_negative_sdna(prop, NULL, "flags", MOD_BEVEL_EVEN_WIDTHS);
Add 'loop slide' option to bevel. See T45260 Current behavior of bevel is to 'loop slide' along unbeveled edges when possible, but this produces uneven bevel widths sometimes, so this option lets user choose between having the loop slide effect or having more even bevel widths. Trying it out with default being 'no loop slide', so different from current behavior. May reverse this choice later, depending on user reactions.
2015-07-05 09:53:17 -04:00
RNA_def_property_ui_text(prop, "Loop Slide", "Prefer sliding along edges to having even widths");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added UI support for seams and sharp edges and cleanup
2018-06-04 15:13:54 +05:30
prop = RNA_def_property(srna, "mark_seam", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edge_flags", MOD_BEVEL_MARK_SEAM);
RNA_def_property_ui_text(prop, "Mark Seams", "Mark Seams along beveled edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added UI support for seams and sharp edges and cleanup
2018-06-04 15:13:54 +05:30
prop = RNA_def_property(srna, "mark_sharp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edge_flags", MOD_BEVEL_MARK_SHARP);
RNA_def_property_ui_text(prop, "Mark Sharp", "Mark beveled edges as sharp");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
prop = RNA_def_property(srna, "harden_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_BEVEL_HARDEN_NORMALS);
Cleanup: indentation, wrapping Mostly functions wrapping args, not confirming to our style guide.
2019-03-15 08:53:22 +11:00
RNA_def_property_ui_text(prop, "Harden Normals", "Match normals of new faces to adjacent faces");
Added ability to harden normals. Uses 2 different params: mode and strength. There are still some hiccups with how 2.8 interacts with normals. Will resolve as support gets better
2018-06-11 11:58:26 +05:30
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T58113 Multiple problems with bevel harden normals. Move the bevel hardening code all into bmesh_bevel.c. Based on user feedback, rewrote the bevel hardening algorithm to be more what users want. Based on user feedback, changed the UI, removing some not-useful options. Now hardening normals while beveling is enabled by a simple checkbox. Now setting face strength gives options for which faces get their face strength set.
2019-01-03 13:39:52 -05:00
prop = RNA_def_property(srna, "face_strength_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "face_str_mode");
RNA_def_property_enum_items(prop, prop_harden_normals_items);
RNA_def_property_ui_text(
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
prop, "Face Strength", "Whether to set face strength, and which faces to set it on");
Added face strength in bevel modifier The selected face strength (Weak/Medium/High) can be used by the WN Modifier to determine influence of current face in
2018-06-19 19:27:08 +05:30
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
prop = RNA_def_property(srna, "miter_outer", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "miter_outer");
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
RNA_def_property_enum_items(prop, prop_miter_outer_items);
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
RNA_def_property_ui_text(prop, "Outer Miter", "Pattern to use for outside of miters");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
prop = RNA_def_property(srna, "miter_inner", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "miter_inner");
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
RNA_def_property_enum_items(prop, prop_miter_inner_items);
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
RNA_def_property_ui_text(prop, "Inner Miter", "Pattern to use for inside of miters");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
prop = RNA_def_property(srna, "spread", PROP_FLOAT, PROP_DISTANCE);
Fix bevel modifier spread value bug. Was using same field as value, by mistake.
2019-01-19 15:56:11 -05:00
RNA_def_property_float_sdna(prop, NULL, "spread");
Add miter pattern options. Will document the new options in release notes, then in manual. Still a bit of work to do on the bulging shape that appears on cube corners if using arc inner miters, but will do that later. Also need to do something smarter in clamp overlap.
2019-01-18 12:54:10 -05:00
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 100.0f, 0.1, 4);
RNA_def_property_ui_text(prop, "Spread", "Spread distance for inner miter arcs");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Bevel: Custom Profile and CurveProfile Widget Custom profiles in bevel allows the profile curve to be controlled by manually placed control points. Orientation is regularized along groups of edges, and the 'pipe case' is updated. This commit includes many updates to comments and changed variable names as well. A 'cutoff' vertex mesh method is added to bevel in addition to the existing grid fill option for replacing vertices. The UI of the bevel modifier and tool are updated and unified. Also, a 'CurveProfile' widget is added to BKE for defining the profile in the interface, which may be useful in other situations. Many thanks to Howard, my mentor for this GSoC project. Reviewers: howardt, campbellbarton Differential Revision: https://developer.blender.org/D5516
2019-11-20 16:12:32 -05:00
prop = RNA_def_property(srna, "custom_profile", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "CurveProfile");
RNA_def_property_pointer_sdna(prop, NULL, "custom_profile");
RNA_def_property_ui_text(prop, "Custom Profile Path", "The path for the custom profile");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "vmesh_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "vmesh_method");
RNA_def_property_enum_items(prop, prop_vmesh_method_items);
RNA_def_property_ui_text(
prop, "Vertex Mesh Method", "The method to use to create the mesh at intersections");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem shrink_type_items[] = {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_SHRINKWRAP_NEAREST_SURFACE,
"NEAREST_SURFACEPOINT",
0,
"Nearest Surface Point",
"Shrink the mesh to the nearest target surface"},
{MOD_SHRINKWRAP_PROJECT,
"PROJECT",
0,
"Project",
"Shrink the mesh to the nearest target surface along a given axis"},
{MOD_SHRINKWRAP_NEAREST_VERTEX,
"NEAREST_VERTEX",
0,
"Nearest Vertex",
"Shrink the mesh to the nearest target vertex"},
Shrinkwrap: new mode that projects along the target normal. The Nearest Surface Point shrink method, while fast, is neither smooth nor continuous: as the source point moves, the projected point can both stop and jump. This causes distortions in the deformation of the shrinkwrap modifier, and the motion of an animated object with a shrinkwrap constraint. This patch implements a new mode, which, instead of using the simple nearest point search, iteratively solves an equation for each triangle to find a point which has its interpolated normal point to or from the original vertex. Non-manifold boundary edges are treated as infinitely thin cylinders that cast normals in all perpendicular directions. Since this is useful for the constraint, and having multiple objects with constraints targeting the same guide mesh is a quite reasonable use case, rather than calculating the mesh boundary edge data over and over again, it is precomputed and cached in the mesh. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3836
2018-11-06 21:04:53 +03:00
{MOD_SHRINKWRAP_TARGET_PROJECT,
"TARGET_PROJECT",
0,
"Target Normal Project",
"Shrink the mesh to the nearest target surface "
"along the interpolated vertex normals of the target"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem shrink_face_cull_items[] = {
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
{0, "OFF", 0, "Off", "No culling"},
{MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE,
"FRONT",
0,
"Front",
"No projection when in front of the face"},
{MOD_SHRINKWRAP_CULL_TARGET_BACKFACE,
"BACK",
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
0,
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Back",
"No projection when behind the face"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
srna = RNA_def_struct(brna, "ShrinkwrapModifier", "Modifier");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_text(srna,
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Shrinkwrap Modifier",
"Shrink wrapping modifier to shrink wrap and object to a target");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_sdna(srna, "ShrinkwrapModifierData");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SHRINKWRAP);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
prop = RNA_def_property(srna, "wrap_method", PROP_ENUM, PROP_NONE);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_enum_sdna(prop, NULL, "shrinkType");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_enum_items(prop, shrink_type_items);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(prop, "Wrap Method", "");
Shrinkwrap: implement the use of smooth normals in constraint & modifier. - Use smooth normals to displace in Above Surface mode. - Add an option to align an axis to the normal in the constraint. I've seen people request the alignment feature, and it seems useful. For the actual aligning I use the damped track logic. In order to conveniently keep mesh data needed for normal computation together, a new data structure is introduced. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3762
2018-10-03 19:09:43 +03:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implement additional modes for Shrinkwrap to a surface. In addition to the original map to surface and Keep Above Surface, add modes that only affect vertices that are inside or outside the object. This is inspired by the Limit Distance constraint, and can be useful for crude collision detection in rigs. The inside/outside test works based on face normals and may not be completely reliable near 90 degree or sharper angles in the target. Reviewers: campbellbarton, mont29 Differential Revision: https://developer.blender.org/D3717
2018-07-07 18:39:45 +03:00
prop = RNA_def_property(srna, "wrap_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "shrinkMode");
RNA_def_property_enum_items(prop, rna_enum_modifier_shrinkwrap_mode_items);
RNA_def_property_ui_text(
prop, "Snap Mode", "Select how vertices are constrained to the target surface");
Shrinkwrap: implement the use of smooth normals in constraint & modifier. - Use smooth normals to displace in Above Surface mode. - Add an option to align an axis to the normal in the constraint. I've seen people request the alignment feature, and it seems useful. For the actual aligning I use the damped track logic. In order to conveniently keep mesh data needed for normal computation together, a new data structure is introduced. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3762
2018-10-03 19:09:43 +03:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "cull_face", PROP_ENUM, PROP_NONE);
change shrinkwrap modifier cull front/back options from 2 booleans into an enum since it makes no sense to have front and back enabled at once.
2011-02-19 09:53:38 +00:00
RNA_def_property_enum_sdna(prop, NULL, "shrinkOpts");
RNA_def_property_enum_items(prop, shrink_face_cull_items);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_enum_funcs(
prop, "rna_ShrinkwrapModifier_face_cull_get", "rna_ShrinkwrapModifier_face_cull_set", NULL);
RNA_def_property_ui_text(
prop,
"Face Cull",
"Stop vertices from projecting to a face on the target when facing towards/away");
change shrinkwrap modifier cull front/back options from 2 booleans into an enum since it makes no sense to have front and back enabled at once.
2011-02-19 09:53:38 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Target", "Mesh target to shrink to");
pointer poll functions for object's, mainly for modifiers, constraints. Lattice modifier only shows lattices types, Shrink wrap only meshes etc.
2010-08-03 06:51:36 +00:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ShrinkwrapModifier_target_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "auxiliary_target", PROP_POINTER, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "auxTarget");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Auxiliary Target", "Additional mesh target to shrink to");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_ShrinkwrapModifier_auxTarget_set", NULL, "rna_Mesh_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_string_sdna(prop, NULL, "vgroup_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ShrinkwrapModifier_vgroup_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix: Use correct units in Shrinkwrap modifier Differential Revision: https://developer.blender.org/D4261
2019-01-27 12:22:14 +01:00
prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_UNIT_LENGTH);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_float_sdna(prop, NULL, "keepDist");
Change in behavior to shrinkwrap modifier's offset value with negative enabled. - negative ray casts would invert the offset direction. this meant if positive and negative were enabled at once and the mesh was slightly inside & outside the object it wrapped, the offset would be applied in opposite directions. This way the offset is always along the vertex normal. - allow negative offset from RNA, could be useful and no benefit to disable.
2011-02-08 02:09:59 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100, 100, 1, 2);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Offset", "Distance to keep from the target");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix: Use correct units in Shrinkwrap modifier Differential Revision: https://developer.blender.org/D4261
2019-01-27 12:22:14 +01:00
prop = RNA_def_property(srna, "project_limit", PROP_FLOAT, PROP_UNIT_LENGTH);
add a distance limit to the shrinkwrap modifiers project mode, it was problematic for vertices to fire rays out and hit some unrelated-far-off geometry which is often not what users want.
2012-11-09 04:20:17 +00:00
RNA_def_property_float_sdna(prop, NULL, "projLimit");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 100, 1, 2);
RNA_def_property_ui_text(
prop, "Project Limit", "Limit the distance used for projection (zero disables)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_project_x", PROP_BOOLEAN, PROP_NONE);
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS);
RNA_def_property_ui_text(prop, "X", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_project_y", PROP_BOOLEAN, PROP_NONE);
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS);
RNA_def_property_ui_text(prop, "Y", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_project_z", PROP_BOOLEAN, PROP_NONE);
Fixed a couple of properties in Modifiers.
2009-01-03 23:14:33 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS);
RNA_def_property_ui_text(prop, "Z", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "subsurf_levels", PROP_INT, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_int_sdna(prop, NULL, "subsurfLevels");
2.5: * Fixed some RNA properties Ranges.
2009-06-11 16:59:59 +00:00
RNA_def_property_range(prop, 0, 6);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 6, 1, -1);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
UI: Do Use term 'Subsurf'
2020-06-07 18:16:56 -04:00
"Subdivision Levels",
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Number of subdivisions that must be performed before extracting vertices' "
"positions and normals");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_negative_direction", PROP_BOOLEAN, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(
prop, "Negative", "Allow vertices to move in the negative direction of axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_positive_direction", PROP_BOOLEAN, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(
prop, "Positive", "Allow vertices to move in the positive direction of axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Shrinkwrap Constraint: implement projection features from the modifier. Allow raycasting in two directions and culling front or back faces. Also implement a new Invert Cull option in both constraint and modifier that can be used to aim for faces aligned with the project axis direction when raycasting both ways. Reviewers: mont29 Differential Revision: https://developer.blender.org/D3737
2018-07-08 13:47:26 +03:00
prop = RNA_def_property(srna, "use_invert_cull", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_INVERT_CULL_TARGET);
RNA_def_property_ui_text(
prop, "Invert Cull", "When projecting in the negative direction invert the face cull mode");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Shrink Wrap modifier: invert vgroup option D1839 from @Orgold
2016-03-07 11:24:03 +11:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_mask(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem modifier_mask_mode_items[] = {
RNA * Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
2009-06-16 00:52:21 +00:00
{MOD_MASK_MODE_VGROUP, "VERTEX_GROUP", 0, "Vertex Group", ""},
{MOD_MASK_MODE_ARM, "ARMATURE", 0, "Armature", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "MaskModifier", "Modifier");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_struct_ui_text(srna, "Mask Modifier", "Mask modifier to hide parts of the mesh");
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
RNA_def_struct_sdna(srna, "MaskModifierData");
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_MASK);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_enum_items(prop, modifier_mask_mode_items);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_ui_text(prop, "Mode", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "armature", PROP_POINTER, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "ob_arm");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Armature", "Armature to use as source of bones to mask");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_pointer_funcs(
prop, NULL, "rna_MaskModifier_ob_arm_set", NULL, "rna_Armature_object_poll");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_string_sdna(prop, NULL, "vgroup");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
RNA * DNA_cloth_types.h, patch by Roelf de Kock. The gravity[3] member is not being parsed correct by makesdna.c and will give issues even when trying to fix it. Worked around it for now in RNA by wrapping it manually, but this should really be fixed in the DNA genetics code, added a comment about it in DNA_cloth_types.h. * Handle vertex groups and uv layers more consistent now. They are all exposed as strings now. Reason is that indices don't really say much, and a direct pointer is not always possible because for example a uv layer in a material can be used for multiple objects and so there is no single pointer. In python it is not too hard to use either since the strings works as a key for lookups. For the user interface we can later think of some method to generate popup menus in a way that works for vertex groups, uv layers, bones etc. * This also fixes the XXX's in rna_modifier.c, I think that can be marked done.
2009-01-04 19:25:24 +00:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MaskModifier_vgroup_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MASK_INV);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Invert", "Use vertices that are not part of region defined");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: mask threshold option D3834 by @Allosteric
2018-10-29 13:01:48 +11:00
prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "threshold");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
RNA_def_property_ui_text(prop, "Threshold", "Weights over this threshold remain");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
static void rna_def_modifier_simpledeform(BlenderRNA *brna)
{
StructRNA *srna;
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem simple_deform_mode_items[] = {
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
{MOD_SIMPLEDEFORM_MODE_TWIST,
"TWIST",
0,
"Twist",
"Rotate around the Z axis of the modifier space"},
{MOD_SIMPLEDEFORM_MODE_BEND,
"BEND",
0,
"Bend",
"Bend the mesh over the Z axis of the modifier space"},
{MOD_SIMPLEDEFORM_MODE_TAPER,
"TAPER",
0,
"Taper",
"Linearly scale along Z axis of the modifier space"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_SIMPLEDEFORM_MODE_STRETCH,
"STRETCH",
0,
"Stretch",
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
"Stretch the object along the Z axis of the modifier space"},
{0, NULL, 0, NULL, NULL},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
};
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SimpleDeformModifier", "Modifier");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_struct_ui_text(
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
srna,
"SimpleDeform Modifier",
UI/RNA: * Added an icon entry to RNA structs, instead of the UI_GetIconRNA function, to keep code together a bit more and make the lookup faster.
2009-06-03 23:16:51 +00:00
"Simple deformation modifier to apply effects such as twisting and bending");
RNA_def_struct_sdna(srna, "SimpleDeformModifierData");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SIMPLEDEFORM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
rna renaming (manual edits)
2010-08-21 04:51:00 +00:00
prop = RNA_def_property(srna, "deform_method", PROP_ENUM, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_enum_sdna(prop, NULL, "mode");
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_enum_items(prop, simple_deform_mode_items);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_ui_text(prop, "Mode", "");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_string_sdna(prop, NULL, "vgroup_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SimpleDeformModifier_vgroup_name_set");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add deform axis for Simple Deform modifier D2989 by @dmarra w/ own edits
2018-01-09 14:59:45 +11:00
prop = RNA_def_property(srna, "deform_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
RNA_def_property_ui_text(prop, "Axis", "Deform around local axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "origin", PROP_POINTER, PROP_NONE);
Improve tip for simple deform origin
2014-12-15 16:10:17 +01:00
RNA_def_property_ui_text(prop, "Origin", "Offset the origin and orientation of the deformation");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
2.5 RNA: * Found more bugs in factor properties.
2009-06-04 11:16:56 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Address request from T46136: make softrange for 'simple deform' angle from -360 to 360 degrees... This should be safe enough for final 2.76, sould we make other RC.
2015-09-18 08:27:04 +02:00
RNA_def_property_ui_range(prop, -10.0, 10.0, 1.0, 3);
UI messages fix: no end point in tips! (from r55055).
2013-03-05 15:15:53 +00:00
RNA_def_property_ui_text(prop, "Factor", "Amount to deform object");
Simple deform modifier: replace factor property by angle for twist and bend modes, so we can show degrees rather than radians. Still refers to the same DNA variable to keep backwards compatibility. Patch #33807 by Gottfried Hofmann.
2013-03-05 14:42:06 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Simple deform modifier: replace factor property by angle for twist and bend modes, so we can show degrees rather than radians. Still refers to the same DNA variable to keep backwards compatibility. Patch #33807 by Gottfried Hofmann.
2013-03-05 14:42:06 +00:00
prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "factor");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Address request from T46136: make softrange for 'simple deform' angle from -360 to 360 degrees... This should be safe enough for final 2.76, sould we make other RC.
2015-09-18 08:27:04 +02:00
RNA_def_property_ui_range(prop, DEG2RAD(-360.0), DEG2RAD(360.0), 10.0, 3);
UI messages fix: no end point in tips! (from r55055).
2013-03-05 15:15:53 +00:00
RNA_def_property_ui_text(prop, "Angle", "Angle of deformation");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "limits", PROP_FLOAT, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_float_sdna(prop, NULL, "limit");
RNA_def_property_array(prop, 2);
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_range(prop, 0, 1, 5, 2);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Limits", "Lower/Upper limits for deform");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lock_x", PROP_BOOLEAN, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_X);
Add deform axis for Simple Deform modifier D2989 by @dmarra w/ own edits
2018-01-09 14:59:45 +11:00
RNA_def_property_ui_text(prop, "X", "Do not allow deformation along the X axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "lock_y", PROP_BOOLEAN, PROP_NONE);
Added RNA for Shrinkwrap, Mask, and SimpleDeform modifiers. That's all the modifiers for now.
2009-01-02 19:22:43 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_Y);
Add deform axis for Simple Deform modifier D2989 by @dmarra w/ own edits
2018-01-09 14:59:45 +11:00
RNA_def_property_ui_text(prop, "Y", "Do not allow deformation along the Y axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add deform axis for Simple Deform modifier D2989 by @dmarra w/ own edits
2018-01-09 14:59:45 +11:00
prop = RNA_def_property(srna, "lock_z", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_Z);
RNA_def_property_ui_text(prop, "Z", "Do not allow deformation along the Z axis");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Simple Deform modifier: invert vgroup option D1839 from @Orgold
2016-03-07 11:28:21 +11:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SIMPLEDEFORM_FLAG_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
}
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
static void rna_def_modifier_surface(BlenderRNA *brna)
{
StructRNA *srna;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SurfaceModifier", "Modifier");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_struct_ui_text(
srna,
"Surface Modifier",
"Surface modifier defining modifier stack position used for surface fields");
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_struct_sdna(srna, "SurfaceModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_PHYSICS);
}
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
static void rna_def_modifier_solidify(BlenderRNA *brna)
{
Solidify Modifier: support non-manifold input This adds a new mode to solidify to support non-manifold geometry with edges using 3 or more faces as input, resulting in a manifold mesh. Since the differences between these methods don't translate well into short terms, they're named "Simple" and "Complex" in the UI. This also adds clamp with respect to angles to the existing solidify modifier calculation.
2019-11-03 14:24:24 +11:00
static const EnumPropertyItem mode_items[] = {
{MOD_SOLIDIFY_MODE_EXTRUDE,
"EXTRUDE",
0,
"Simple",
"Output a solidified version of a mesh by simple extrusion"},
{MOD_SOLIDIFY_MODE_NONMANIFOLD,
"NON_MANIFOLD",
0,
"Complex",
"Output a manifold mesh even if the base mesh is non-manifold, "
"where edges have 3 or more connecting faces."
"This method is slower"},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem nonmanifold_thickness_mode_items[] = {
{MOD_SOLIDIFY_NONMANIFOLD_OFFSET_MODE_FIXED,
"FIXED",
0,
"Fixed",
"Most basic thickness calculation"},
{MOD_SOLIDIFY_NONMANIFOLD_OFFSET_MODE_EVEN,
"EVEN",
0,
"Even",
"Even thickness calculation which takes the angle between faces into account"},
{MOD_SOLIDIFY_NONMANIFOLD_OFFSET_MODE_CONSTRAINTS,
"CONSTRAINTS",
0,
"Constraints",
"Thickness calculation using constraints, most advanced"},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem nonmanifold_boundary_mode_items[] = {
{MOD_SOLIDIFY_NONMANIFOLD_BOUNDARY_MODE_NONE, "NONE", 0, "None", "No shape correction"},
{MOD_SOLIDIFY_NONMANIFOLD_BOUNDARY_MODE_ROUND,
"ROUND",
0,
"Round",
"Round open perimeter shape"},
{MOD_SOLIDIFY_NONMANIFOLD_BOUNDARY_MODE_FLAT,
"FLAT",
0,
"Flat",
"Flat open perimeter shape"},
{0, NULL, 0, NULL, NULL},
};
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "SolidifyModifier", "Modifier");
Solidify Modifier: support non-manifold input This adds a new mode to solidify to support non-manifold geometry with edges using 3 or more faces as input, resulting in a manifold mesh. Since the differences between these methods don't translate well into short terms, they're named "Simple" and "Complex" in the UI. This also adds clamp with respect to angles to the existing solidify modifier calculation.
2019-11-03 14:24:24 +11:00
RNA_def_struct_ui_text(
srna, "Solidify Modifier", "Create a solid skin, compensating for sharp angles");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_struct_sdna(srna, "SolidifyModifierData");
Added an icon for solidify modifier. Maybe if Jendryzch is around, he might want to make a better one :)
2010-01-22 02:23:28 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_SOLIDIFY);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Solidify Modifier: support non-manifold input This adds a new mode to solidify to support non-manifold geometry with edges using 3 or more faces as input, resulting in a manifold mesh. Since the differences between these methods don't translate well into short terms, they're named "Simple" and "Complex" in the UI. This also adds clamp with respect to angles to the existing solidify modifier calculation.
2019-11-03 14:24:24 +11:00
prop = RNA_def_property(srna, "solidify_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");
RNA_def_property_enum_items(prop, mode_items);
RNA_def_property_ui_text(prop, "Mode", "Selects the used algorithm");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "thickness", PROP_FLOAT, PROP_DISTANCE);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_float_sdna(prop, NULL, "offset");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -10, 10, 0.1, 4);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Thickness", "Thickness of the shell");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
solidify modifier: thickness clamping helps prevent self intersections when there are small details on a larger model.
2013-03-13 17:31:26 +00:00
prop = RNA_def_property(srna, "thickness_clamp", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "offset_clamp");
RNA_def_property_range(prop, 0, 100.0);
RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 4);
RNA_def_property_ui_text(prop, "Clamp", "Offset clamp based on geometry scale");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Solidify Modifier: support non-manifold input This adds a new mode to solidify to support non-manifold geometry with edges using 3 or more faces as input, resulting in a manifold mesh. Since the differences between these methods don't translate well into short terms, they're named "Simple" and "Complex" in the UI. This also adds clamp with respect to angles to the existing solidify modifier calculation.
2019-11-03 14:24:24 +11:00
prop = RNA_def_property(srna, "use_thickness_angle_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_OFFSET_ANGLE_CLAMP);
RNA_def_property_ui_text(prop, "Angle Clamp", "Clamp thickness based on angles");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "thickness_vertex_group", PROP_FLOAT, PROP_FACTOR);
fix [#28225] Solidify Modifier creates wrong results when vertex group is attached infact this is not really a bug, irrespective zero vertex group weights gave overlapping geometry which isn't useful, add an option to set the thickness factor for zero weighted verts.
2011-08-14 06:43:58 +00:00
RNA_def_property_float_sdna(prop, NULL, "offset_fac_vg");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop, "Vertex Group Factor", "Thickness factor to use for zero vertex group influence");
fix [#28225] Solidify Modifier creates wrong results when vertex group is attached infact this is not really a bug, irrespective zero vertex group weights gave overlapping geometry which isn't useful, add an option to set the thickness factor for zero weighted verts.
2011-08-14 06:43:58 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_FACTOR);
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27867:27871
2010-03-31 07:28:23 +00:00
RNA_def_property_float_sdna(prop, NULL, "offset_fac");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -1, 1, 0.1, 4);
[#22782] Solidify Thickness negative and positive values are the same result more a communication problem but Ed Britton raises a valid point that often you want the original faces so changing the default offset to -1.0.
2010-07-14 08:24:24 +00:00
RNA_def_property_ui_text(prop, "Offset", "Offset the thickness from the center");
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27867:27871
2010-03-31 07:28:23 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "edge_crease_inner", PROP_FLOAT, PROP_FACTOR);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_float_sdna(prop, NULL, "crease_inner");
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Inner Crease", "Assign a crease to inner edges");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "edge_crease_outer", PROP_FLOAT, PROP_FACTOR);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_float_sdna(prop, NULL, "crease_outer");
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Outer Crease", "Assign a crease to outer edges");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "edge_crease_rim", PROP_FLOAT, PROP_FACTOR);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_float_sdna(prop, NULL, "crease_rim");
RNA_def_property_range(prop, 0, 1);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Rim Crease", "Assign a crease to the edges making up the rim");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "material_offset", PROP_INT, PROP_NONE);
solidify material offsets for 2nd surface and rim faces. run do_versions() on use_rim_material option so Sintel's jacket loads ok. (request from Bassam)
2011-03-03 05:09:07 +00:00
RNA_def_property_int_sdna(prop, NULL, "mat_ofs");
RNA_def_property_range(prop, SHRT_MIN, SHRT_MAX);
RNA_def_property_ui_text(prop, "Material Offset", "Offset material index of generated faces");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "material_offset_rim", PROP_INT, PROP_NONE);
solidify material offsets for 2nd surface and rim faces. run do_versions() on use_rim_material option so Sintel's jacket loads ok. (request from Bassam)
2011-03-03 05:09:07 +00:00
RNA_def_property_int_sdna(prop, NULL, "mat_ofs_rim");
RNA_def_property_range(prop, SHRT_MIN, SHRT_MAX);
RNA_def_property_ui_text(
prop, "Rim Material Offset", "Offset material index of generated rim faces");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
modifier.c has all its vergex group index lookups inline, use get_named_vertexgroup_num() instead. no functional changes.
2010-01-26 09:36:33 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SolidifyModifier_defgrp_name_set");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Solidify modifier: add option to assign shell & rim geometry to selected vertex groups. This commit gives the solidify modifier the ability to assign the newly created shell and rim geometries to selected vertex groups. This expands the procedural control over the modifier stack by letting users apply modifiers to the shell geometry without affecting the original geometry. This will be especially helpful for NPR users that use solidify to create backface culling lines on their characters giving them the ability to add displace noise and other effects. Differential Revision: https://developer.blender.org/D6903
2020-03-27 10:56:14 +01:00
prop = RNA_def_property(srna, "shell_vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "shell_defgrp_name");
Surface Deform modifier: add vertex group and strength control. This commit aims to add functionality to the surface deform modifier that gives more control and allows it to work better with the modifier stack. * Maintains compatibility with older files. The default settings keep it so that the whole object is bound and vertex coordinates get overwritten as the modifier currently does. * Turns the deformations from an absolute vertex coordinate overwrite into an additive offset from the vertex location before the modifier to the resulting bound deformation. This gives the ability to control the strength of the deformation and mix the deformation of the modifier with the modifier stack that comes before it. * Also adds in a vertex group with the invert option. This is applied after the bind deformation is added. So the whole object is still bound to target, and the vertex group filters afterwards what parts get affected. I experimented with a version to only binds the geometry weighted to the vertex group, but that would break compatibility with old files. I may bring it in later as a separate option/mode for the surface deform. With several fixes from @mont29. Reviewed By: mont29 Differencial Revision: https://developer.blender.org/D6894
2020-03-27 12:20:31 +01:00
RNA_def_property_ui_text(prop,
"Shell Vertex Group",
"Vertex group that the generated shell geometry will be weighted to");
Solidify modifier: add option to assign shell & rim geometry to selected vertex groups. This commit gives the solidify modifier the ability to assign the newly created shell and rim geometries to selected vertex groups. This expands the procedural control over the modifier stack by letting users apply modifiers to the shell geometry without affecting the original geometry. This will be especially helpful for NPR users that use solidify to create backface culling lines on their characters giving them the ability to add displace noise and other effects. Differential Revision: https://developer.blender.org/D6903
2020-03-27 10:56:14 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SolidifyModifier_shell_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "rim_vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "rim_defgrp_name");
Surface Deform modifier: add vertex group and strength control. This commit aims to add functionality to the surface deform modifier that gives more control and allows it to work better with the modifier stack. * Maintains compatibility with older files. The default settings keep it so that the whole object is bound and vertex coordinates get overwritten as the modifier currently does. * Turns the deformations from an absolute vertex coordinate overwrite into an additive offset from the vertex location before the modifier to the resulting bound deformation. This gives the ability to control the strength of the deformation and mix the deformation of the modifier with the modifier stack that comes before it. * Also adds in a vertex group with the invert option. This is applied after the bind deformation is added. So the whole object is still bound to target, and the vertex group filters afterwards what parts get affected. I experimented with a version to only binds the geometry weighted to the vertex group, but that would break compatibility with old files. I may bring it in later as a separate option/mode for the surface deform. With several fixes from @mont29. Reviewed By: mont29 Differencial Revision: https://developer.blender.org/D6894
2020-03-27 12:20:31 +01:00
RNA_def_property_ui_text(prop,
"Rim Vertex Group",
"Vertex group that the generated rim geometry will be weighted to");
Solidify modifier: add option to assign shell & rim geometry to selected vertex groups. This commit gives the solidify modifier the ability to assign the newly created shell and rim geometries to selected vertex groups. This expands the procedural control over the modifier stack by letting users apply modifiers to the shell geometry without affecting the original geometry. This will be especially helpful for NPR users that use solidify to create backface culling lines on their characters giving them the ability to add displace noise and other effects. Differential Revision: https://developer.blender.org/D6903
2020-03-27 10:56:14 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SolidifyModifier_rim_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_rim", PROP_BOOLEAN, PROP_NONE);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_RIM);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(prop,
"Fill Rim",
"Create edge loops between the inner and outer surfaces on face edges "
"(slow, disable when not needed)");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_even_offset", PROP_BOOLEAN, PROP_NONE);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_EVEN);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Even Thickness",
"Maintain thickness by adjusting for sharp corners (slow, disable when not needed)");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_quality_normals", PROP_BOOLEAN, PROP_NONE);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_NORMAL_CALC);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"High Quality Normals",
"Calculate normals which result in more even thickness (slow, disable when not needed)");
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27867:27871
2010-03-31 07:28:23 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_VGROUP_INV);
RNA_def_property_ui_text(prop, "Vertex Group Invert", "Invert the vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add Complex Solidify option for thickness per face Add an option to solidify complex which will make faces which have thickness controlled by vertex weights flat/even, and parallel to their original face. For each face it uses the minimal weight assigned to its vertices to control the thickness. This will help users for example in architecture or basic CAD design by finally making solidify work there at all if altering thickness is needed. Differential Revision: https://developer.blender.org/D7340 Reviewed and minor cleanups by Batien Montagne (@mont29).
2020-04-14 12:22:00 +02:00
prop = RNA_def_property(srna, "use_flat_faces", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_NONMANIFOLD_FLAT_FACES);
RNA_def_property_ui_text(prop,
"Flat Faces",
"Make faces use the minimal vertex weight assigned to their vertices"
"(ensures new faces remain parallel to their original ones, slow, "
"disable when not needed)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
solidify option to flip normals
2012-05-26 09:18:47 +00:00
prop = RNA_def_property(srna, "use_flip_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_FLIP);
RNA_def_property_ui_text(prop, "Flip Normals", "Invert the face direction");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Correction to last commit, rna naming
2014-08-15 19:32:45 +10:00
prop = RNA_def_property(srna, "use_rim_only", PROP_BOOLEAN, PROP_NONE);
Solidify Modifier "Rim Only" Option D737 by scorpion81 with own edits
2014-08-15 17:26:39 +10:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_NOSHELL);
RNA_def_property_ui_text(prop, "Only Rim", "Only add the rim to the original data");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Solidify Modifier: support non-manifold input This adds a new mode to solidify to support non-manifold geometry with edges using 3 or more faces as input, resulting in a manifold mesh. Since the differences between these methods don't translate well into short terms, they're named "Simple" and "Complex" in the UI. This also adds clamp with respect to angles to the existing solidify modifier calculation.
2019-11-03 14:24:24 +11:00
/* Settings for #MOD_SOLIDIFY_MODE_NONMANIFOLD */
prop = RNA_def_property(srna, "nonmanifold_thickness_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "nonmanifold_offset_mode");
RNA_def_property_enum_items(prop, nonmanifold_thickness_mode_items);
RNA_def_property_ui_text(prop, "Thickness Mode", "Selects the used thickness algorithm");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "nonmanifold_boundary_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, nonmanifold_boundary_mode_items);
RNA_def_property_ui_text(prop, "Boundary Shape", "Selects the boundary adjustment algorithm");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Fix T75032: New complex solidify algorithm handles poorly merging threshold of small geometry details. * Implemented the algortihm that would merge vertices to the weighted center between them. * Exposed the merge threshold to the user. The new default tolerance is 0.0001 (versionning code ensures that previous default value remains in use to avoid any change in existing files). Review and minor changes/cleanups from Bastien Montagne (@mont29).
2020-04-13 17:15:16 +02:00
prop = RNA_def_property(srna, "nonmanifold_merge_threshold", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "merge_tolerance");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4);
Cleanup: remove redundant include, clang-format
2020-04-14 10:41:05 +10:00
RNA_def_property_ui_text(
prop, "Merge Threshold", "Distance within which degenerated geometry is merged");
Fix T75032: New complex solidify algorithm handles poorly merging threshold of small geometry details. * Implemented the algortihm that would merge vertices to the weighted center between them. * Exposed the merge threshold to the user. The new default tolerance is 0.0001 (versionning code ensures that previous default value remains in use to avoid any change in existing files). Review and minor changes/cleanups from Bastien Montagne (@mont29).
2020-04-13 17:15:16 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Improve Solidify/Bevel Modifier cooperation Adds a slider to solidify which allows the user to add bevel weight on the outside or remove bevel weight from the inside. Also includes a very small improvment for working with subsurface modifier where the rim edge in complex solidify will now also have a chance to get a crease if there is only two adjacent edges. Differential Revision: https://developer.blender.org/D7334 Reviewing and minor cleanups: Bastien Montagne (@mont29).
2020-04-14 10:45:53 +02:00
prop = RNA_def_property(srna, "bevel_convex", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "bevel_convex");
RNA_def_property_range(prop, -1.0, 1.0);
RNA_def_property_ui_range(prop, -1.0, 1.0, 0.1, 3);
RNA_def_property_ui_text(prop, "Bevel Convex", "Edge bevel weight to be added to outside edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
}
static void rna_def_modifier_screw(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "ScrewModifier", "Modifier");
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_struct_ui_text(srna, "Screw Modifier", "Revolve edges");
RNA_def_struct_sdna(srna, "ScrewModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SCREW);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "ob_axis");
RNA_def_property_ui_text(prop, "Object", "Object to define the screw axis");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "steps", PROP_INT, PROP_UNSIGNED);
Screw Modifier: support 1-2 steps The Screw Modifier had a lower limit for the steps value, which not only was inconsistent between render and viewport steps, but also was capped to 2 in UI and also in the code internally.
2020-03-29 20:23:24 +11:00
RNA_def_property_range(prop, 1, 10000);
RNA_def_property_ui_range(prop, 1, 512, 1, -1);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_ui_text(prop, "Steps", "Number of steps in the revolution");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "render_steps", PROP_INT, PROP_UNSIGNED);
Screw Modifier: support 1-2 steps The Screw Modifier had a lower limit for the steps value, which not only was inconsistent between render and viewport steps, but also was capped to 2 in UI and also in the code internally.
2020-03-29 20:23:24 +11:00
RNA_def_property_range(prop, 1, 10000);
RNA_def_property_ui_range(prop, 1, 512, 1, -1);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_ui_text(prop, "Render Steps", "Number of steps in the revolution");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_int_sdna(prop, NULL, "iter");
spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text)
2010-03-22 09:30:00 +00:00
RNA_def_property_range(prop, 1, 10000);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 100, 1, -1);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_ui_text(prop, "Iterations", "Number of times to apply the screw operation");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_ui_text(prop, "Axis", "Screw axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
RNA: angle step-sizes were too small These were ignored previously, so it wasn't noticeable.
2015-09-21 09:44:14 +10:00
RNA_def_property_ui_range(prop, -M_PI * 2, M_PI * 2, 10, -1);
fixes for screw modifier - steps for a closed screw was off by 1 - screw offset wasnt being copied
2010-03-22 08:49:12 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_ui_text(prop, "Angle", "Angle of revolution");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "screw_offset", PROP_FLOAT, PROP_DISTANCE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_float_sdna(prop, NULL, "screw_ofs");
RNA_def_property_ui_text(prop, "Screw", "Offset the revolution along its axis");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Screw Modifier: remove doubles option Vertices on the axis can be optionally merged, nice for creating objects which close at the end-points.
2017-09-07 00:10:13 +10:00
prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "merge_dist");
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 1, 1, 4);
RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal_flip", PROP_BOOLEAN, PROP_NONE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_NORMAL_FLIP);
RNA_def_property_ui_text(prop, "Flip", "Flip normals of lathed faces");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normal_calculate", PROP_BOOLEAN, PROP_NONE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_NORMAL_CALC);
RNA_def_property_ui_text(
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
prop, "Calculate Order", "Calculate the order of edges (needed for meshes, but not curves)");
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_object_screw_offset", PROP_BOOLEAN, PROP_NONE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_OFFSET);
RNA_def_property_ui_text(
prop, "Object Screw", "Use the distance between the objects to make a screw");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Screw Modifier: remove doubles option Vertices on the axis can be optionally merged, nice for creating objects which close at the end-points.
2017-09-07 00:10:13 +10:00
/* Vertex merging parameters */
prop = RNA_def_property(srna, "use_merge_vertices", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_MERGE);
RNA_def_property_ui_text(
prop, "Merge Vertices", "Merge adjacent vertices (screw offset must be zero)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add option for screw modifier to smooth shade. (renamed smooth_shading to use_smooth_shade for remesh modifier too)
2012-05-18 10:37:49 +00:00
prop = RNA_def_property(srna, "use_smooth_shade", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_SMOOTH_SHADING);
RNA_def_property_ui_text(
prop, "Smooth Shading", "Output faces with smooth shading rather than flat shaded");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Screw Modifier: UV support - When existing faces are available use their UV values - When no faces are connected to an edge - generate UV's Also add option to stretch U/V to bounds.
2013-11-26 21:22:56 +11:00
prop = RNA_def_property(srna, "use_stretch_u", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_U);
RNA_def_property_ui_text(
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
prop, "Stretch U", "Stretch the U coordinates between 0 and 1 when UV's are present");
Screw Modifier: UV support - When existing faces are available use their UV values - When no faces are connected to an edge - generate UV's Also add option to stretch U/V to bounds.
2013-11-26 21:22:56 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Screw Modifier: UV support - When existing faces are available use their UV values - When no faces are connected to an edge - generate UV's Also add option to stretch U/V to bounds.
2013-11-26 21:22:56 +11:00
prop = RNA_def_property(srna, "use_stretch_v", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_UV_STRETCH_V);
RNA_def_property_ui_text(
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
prop, "Stretch V", "Stretch the V coordinates between 0 and 1 when UV's are present");
Screw Modifier: UV support - When existing faces are available use their UV values - When no faces are connected to an edge - generate UV's Also add option to stretch U/V to bounds.
2013-11-26 21:22:56 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
# if 0
style cleanup
2012-06-10 19:59:02 +00:00
prop = RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NONE);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE);
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
RNA_def_property_ui_text(
prop, "Object Angle", "Use the angle between the objects rather than the fixed angle");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
# endif
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
}
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
static void rna_def_modifier_uvwarp(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
srna = RNA_def_struct(brna, "UVWarpModifier", "Modifier");
RNA_def_struct_ui_text(srna, "UVWarp Modifier", "Add target position to uv coordinates");
RNA_def_struct_sdna(srna, "UVWarpModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_UVPROJECT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "axis_u", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "axis_u");
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_ui_text(prop, "U-Axis", "Pole axis for rotation");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "axis_v", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "axis_v");
Cleanup: use generic xyz axis enums
2016-01-07 20:22:49 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_ui_text(prop, "V-Axis", "Pole axis for rotation");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "center", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "center");
RNA_def_property_ui_text(prop, "UV Center", "Center point for rotate/scale");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Add option to directly specify a 2D transform for UVWarp Currently the only option is to warp based on the transform of other objects, which is inconvenient if you want to e.g. control it through a driver - you need to set up a dummy object and go through that, which is clunky and should be unneccessary. Reviewed By: brecht Differential Revision: https://developer.blender.org/D6690
2020-02-15 01:49:50 +01:00
prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "offset");
RNA_def_property_ui_text(prop, "Offset", "2D Offset for the warp");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "scale");
RNA_def_property_ui_text(prop, "Scale", "2D Scale for the warp");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "rotation");
RNA_def_property_ui_text(prop, "Rotation", "2D Rotation for the warp");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "object_from", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "object_src");
UI: UVWarp-Modifier had duplicate names D1047 by @lichtwerk
2015-02-05 19:18:21 +11:00
RNA_def_property_ui_text(prop, "Object From", "Object defining offset");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "bone_from", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "bone_src");
UI: UVWarp-Modifier had duplicate names D1047 by @lichtwerk
2015-02-05 19:18:21 +11:00
RNA_def_property_ui_text(prop, "Bone From", "Bone defining offset");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "object_to", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "object_dst");
UI: UVWarp-Modifier had duplicate names D1047 by @lichtwerk
2015-02-05 19:18:21 +11:00
RNA_def_property_ui_text(prop, "Object To", "Object defining offset");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "bone_to", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "bone_dst");
UI: UVWarp-Modifier had duplicate names D1047 by @lichtwerk
2015-02-05 19:18:21 +11:00
RNA_def_property_ui_text(prop, "Bone To", "Bone defining offset");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "vgroup_name");
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVWarpModifier_vgroup_name_set");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modifiers: UVWarp modifier add invert vgroup option Adds the invert vgroup option to the UVWarp modifier. Adds a flag and char padding to the DNA. Differential Revision: https://developer.blender.org/D6841
2020-02-18 18:12:06 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_UVWARP_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
prop = RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "uvlayer_name");
RNA_def_property_ui_text(prop, "UV Layer", "UV Layer name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVWarpModifier_uvlayer_name_set");
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
}
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna),
StructRNA *srna,
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
const char *mask_flags,
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
const char *mask_vgroup_setter,
const char *mask_uvlayer_setter)
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_mask_tex_map_items[] = {
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_DISP_MAP_LOCAL, "LOCAL", 0, "Local", "Use local generated coordinates"},
{MOD_DISP_MAP_GLOBAL, "GLOBAL", 0, "Global", "Use global coordinates"},
{MOD_DISP_MAP_OBJECT,
"OBJECT",
0,
"Object",
"Use local generated coordinates of another object"},
{MOD_DISP_MAP_UV, "UV", 0, "UV", "Use coordinates from an UV layer"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_mask_tex_used_items[] = {
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
{MOD_WVG_MASK_TEX_USE_INT, "INT", 0, "Intensity", ""},
{MOD_WVG_MASK_TEX_USE_RED, "RED", 0, "Red", ""},
{MOD_WVG_MASK_TEX_USE_GREEN, "GREEN", 0, "Green", ""},
{MOD_WVG_MASK_TEX_USE_BLUE, "BLUE", 0, "Blue", ""},
{MOD_WVG_MASK_TEX_USE_HUE, "HUE", 0, "Hue", ""},
{MOD_WVG_MASK_TEX_USE_SAT, "SAT", 0, "Saturation", ""},
{MOD_WVG_MASK_TEX_USE_VAL, "VAL", 0, "Value", ""},
{MOD_WVG_MASK_TEX_USE_ALPHA, "ALPHA", 0, "Alpha", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Changed percentage and 0-1 number fields to use sliders. This is more consistent. Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
2014-01-02 20:54:24 +01:00
prop = RNA_def_property(srna, "mask_constant", PROP_FLOAT, PROP_FACTOR);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(
prop, "Influence", "Global influence of current modifications on vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_vertex_group", PROP_STRING, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_string_sdna(prop, NULL, "mask_defgrp_name");
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(prop, "Mask Vertex Group", "Masking vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, mask_vgroup_setter);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
prop = RNA_def_property(srna, "invert_mask_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, mask_flags, MOD_WVG_EDIT_INVERT_VGROUP_MASK);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group mask influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_texture", PROP_POINTER, PROP_NONE);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Masking Tex", "Masking texture");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE);
Fix T61185: Missing modifiers update on changes to texture Also update relations when modifier texture changes. Basically same as rB6e00415a85a9, rBca2680aaeb1 but this time for VertexWeight modifiers Reviewers: sergey Maniphest Tasks: T61185 Differential Revision: https://developer.blender.org/D4305
2019-02-05 10:04:09 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_tex_use_channel", PROP_ENUM, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_enum_items(prop, weightvg_mask_tex_used_items);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Use Channel", "Which texture channel to use for masking");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_tex_mapping", PROP_ENUM, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_enum_items(prop, weightvg_mask_tex_map_items);
RNA_def_property_ui_text(prop,
"Texture Coordinates",
"Which texture coordinates "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"to use for mapping");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_tex_uv_layer", PROP_STRING, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_string_sdna(prop, NULL, "mask_tex_uvlayer_name");
Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, by Gaia Clary. Rationale: the name was confusing and not always used consistently, and this map itself is not something that can be layered, rather the map can be used as texture coordinates in some layered setup. The original intent was to indicate this contained more than just UV's, but the game engine settings have already been moved out, and apparently users didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
RNA_def_property_ui_text(prop, "UV Map", "UV map name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, mask_uvlayer_setter);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mask_tex_map_object", PROP_POINTER, PROP_NONE);
- mask_tex_map_obj --> mask_tex_map_object - dont allow negative min distances
2011-09-05 03:26:49 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "mask_tex_map_obj");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_ui_text(prop,
"Texture Coordinate Object",
"Which object to take texture "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"coordinates from");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
Modifiers: Add Bone option for Texture Mask Object This patch adds the option to use an armature bone in place of an object for texture mask coordinates. This affects the 3 vertex weight modifiers, the displace modifier, the warp modifier, and the wave modifier. With minor changes from Bastien Montagne (@mont29). Differential Revision: https://developer.blender.org/D7348
2020-04-10 14:03:36 +02:00
prop = RNA_def_property(srna, "mask_tex_map_bone", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "mask_tex_map_bone");
Cleanup: clang-format
2020-04-11 13:01:19 -06:00
RNA_def_property_ui_text(
prop, "Texture Coordinate Bone", "Which bone to take texture coordinates from");
Modifiers: Add Bone option for Texture Mask Object This patch adds the option to use an armature bone in place of an object for texture mask coordinates. This affects the 3 vertex weight modifiers, the displace modifier, the warp modifier, and the wave modifier. With minor changes from Bastien Montagne (@mont29). Differential Revision: https://developer.blender.org/D7348
2020-04-10 14:03:36 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_edit_falloff_type_items[] = {
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_WVG_MAPPING_NONE, "LINEAR", ICON_LINCURVE, "Linear", "Null action"},
VGroup Modifiers: added mapping options to proximity and edit. *Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one. *Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one! *Factorized the common mapping code into MOD_weightvg_util.
2011-09-05 16:16:00 +00:00
{MOD_WVG_MAPPING_CURVE, "CURVE", ICON_RNDCURVE, "Custom Curve", ""},
{MOD_WVG_MAPPING_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
{MOD_WVG_MAPPING_SMOOTH, "SMOOTH", ICON_SMOOTHCURVE, "Smooth", ""},
{MOD_WVG_MAPPING_ROOT, "ROOT", ICON_ROOTCURVE, "Root", ""},
{MOD_WVG_MAPPING_SPHERE, "ICON_SPHERECURVE", ICON_SPHERECURVE, "Sphere", ""},
{MOD_WVG_MAPPING_RANDOM, "RANDOM", ICON_RNDCURVE, "Random", ""},
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_WVG_MAPPING_STEP,
"STEP",
UI: Weight Modifiers Falloff: Use better step icon
2020-06-18 12:44:03 -04:00
ICON_IPO_CONSTANT,
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
"Median Step",
"Map all values below 0.5 to 0.0, and all others to 1.0"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "VertexWeightEditModifier", "Modifier");
vgroup_modifiers: Minor update (names...).
2011-08-18 06:30:59 +00:00
RNA_def_struct_ui_text(
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
srna, "WeightVG Edit Modifier", "Edit the weights of vertices in a group");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_struct_sdna(srna, "WeightVGEditModifierData");
interface + naming improvements to vertex wright modifier - WeightVG -> Vertex Weight - mapping_mode -> falloff_type - nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGEditModifier_defgrp_name_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);
interface + naming improvements to vertex wright modifier - WeightVG -> Vertex Weight - mapping_mode -> falloff_type - nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
RNA_def_property_enum_items(prop, weightvg_edit_falloff_type_items);
Fixed some UI message typos (spotted by Leon Cheung, thx).
2012-04-14 15:44:31 +00:00
RNA_def_property_ui_text(prop, "Falloff Type", "How weights are mapped to their new values");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add invert mapping option to proximity weight edit modifier, and some cleanup.
2020-03-24 18:28:09 +01:00
prop = RNA_def_property(srna, "invert_falloff", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_INVERT_FALLOFF);
RNA_def_property_ui_text(prop, "Invert Falloff", "Invert the resulting falloff weight");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
prop = RNA_def_property(srna, "normalize", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_WEIGHTS_NORMALIZE);
RNA_def_property_ui_text(
prop,
"Normalize Weights",
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
"Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Add invert mapping option to proximity weight edit modifier, and some cleanup.
2020-03-24 18:28:09 +01:00
prop = RNA_def_property(srna, "map_curve", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "cmap_curve");
RNA_def_property_ui_text(prop, "Mapping Curve", "Custom mapping curve");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_add", PROP_BOOLEAN, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_ADD2VG);
correct float -> double promotion warnings
2011-09-05 05:43:01 +00:00
RNA_def_property_ui_text(prop,
"Group Add",
"Add vertices with weight over threshold "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"to vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_remove", PROP_BOOLEAN, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_REMFVG);
correct float -> double promotion warnings
2011-09-05 05:43:01 +00:00
RNA_def_property_ui_text(prop,
"Group Remove",
"Remove vertices with weight below threshold "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"from vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Changed percentage and 0-1 number fields to use sliders. This is more consistent. Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
2014-01-02 20:54:24 +01:00
prop = RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_FACTOR);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_range(prop, 0.0, 1.0f);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_ui_text(prop,
"Default Weight",
"Default weight a vertex will have if "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"it is not in the vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "add_threshold", PROP_FLOAT, PROP_NONE);
minor cleanup of rna - use an rna enum-set for proximity vert/edge/face options. - rename some flags. - better conform to rna naming conventions.
2011-07-28 01:38:48 +00:00
RNA_def_property_float_sdna(prop, NULL, "add_threshold");
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_range(prop, 0.0, 1.0);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
minor edits. - init proximity to 1.0f - min/max proximity dist were not being copied. - minor edits to comments - use ascii chars in a few places.
2011-09-05 03:09:49 +00:00
RNA_def_property_ui_text(prop,
"Add Threshold",
"Lower bound for a vertex's weight "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"to be added to the vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "remove_threshold", PROP_FLOAT, PROP_NONE);
minor cleanup of rna - use an rna enum-set for proximity vert/edge/face options. - rename some flags. - better conform to rna naming conventions.
2011-07-28 01:38:48 +00:00
RNA_def_property_float_sdna(prop, NULL, "rem_threshold");
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_range(prop, 0.0, 1.0);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
RNA_def_property_ui_text(prop,
"Remove Threshold",
"Upper bound for a vertex's weight "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"to be removed from the vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
/* Common masking properties. */
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
rna_def_modifier_weightvg_mask(brna,
srna,
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
"edit_flags",
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
"rna_WeightVGEditModifier_mask_defgrp_name_set",
"rna_WeightVGEditModifier_mask_tex_uvlayer_name_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
static void rna_def_modifier_weightvgmix(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_mix_modes_items[] = {
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
{MOD_WVG_MIX_SET, "SET", 0, "Replace", "Replace VGroup A's weights by VGroup B's ones"},
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_WVG_MIX_ADD, "ADD", 0, "Add", "Add VGroup B's weights to VGroup A's ones"},
{MOD_WVG_MIX_SUB, "SUB", 0, "Subtract", "Subtract VGroup B's weights from VGroup A's ones"},
{MOD_WVG_MIX_MUL, "MUL", 0, "Multiply", "Multiply VGroup A's weights by VGroup B's ones"},
{MOD_WVG_MIX_DIV, "DIV", 0, "Divide", "Divide VGroup A's weights by VGroup B's ones"},
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
2012-07-03 17:20:21 +00:00
{MOD_WVG_MIX_DIF,
"DIF",
0,
"Difference",
"Difference between VGroup A's and VGroup B's weights"},
{MOD_WVG_MIX_AVG, "AVG", 0, "Average", "Average value of VGroup A's and VGroup B's weights"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_mix_set_items[] = {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_WVG_SET_ALL, "ALL", 0, "All", "Affect all vertices (might add some to VGroup A)"},
{MOD_WVG_SET_A, "A", 0, "VGroup A", "Affect vertices in VGroup A"},
{MOD_WVG_SET_B,
"B",
0,
"VGroup B",
"Affect vertices in VGroup B (might add some to VGroup A)"},
{MOD_WVG_SET_OR,
"OR",
0,
"VGroup A or B",
"Affect vertices in at least one of both VGroups (might add some to VGroup A)"},
{MOD_WVG_SET_AND, "AND", 0, "VGroup A and B", "Affect vertices in both groups"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "VertexWeightMixModifier", "Modifier");
vgroup_modifiers: Minor update (names...).
2011-08-18 06:30:59 +00:00
RNA_def_struct_ui_text(srna, "WeightVG Mix Modifier", "Mix the weights of two vertex groups");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_struct_sdna(srna, "WeightVGMixModifierData");
interface + naming improvements to vertex wright modifier - WeightVG -> Vertex Weight - mapping_mode -> falloff_type - nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group_a", PROP_STRING, PROP_NONE);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name_a");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Vertex Group A", "First vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGMixModifier_defgrp_name_a_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group_b", PROP_STRING, PROP_NONE);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name_b");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Vertex Group B", "Second vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGMixModifier_defgrp_name_b_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: add invert vgroup weights options to operands of Mix modifier. Please note that vertices which are in a vgroup are not affected by this option (which means that affected vertices from 'selection' modes remain the same). Only the weights of selected vertices get inverted. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D7811
2020-05-29 18:52:29 +02:00
prop = RNA_def_property(srna, "invert_vertex_group_a", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WVG_MIX_INVERT_VGROUP_A);
RNA_def_property_ui_text(prop, "Invert Weights A", "Invert the influence of vertex group A");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "invert_vertex_group_b", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WVG_MIX_INVERT_VGROUP_B);
RNA_def_property_ui_text(prop, "Invert Weights B", "Invert the influence of vertex group B");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "default_weight_a", PROP_FLOAT, PROP_FACTOR);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_range(prop, 0.0, 1.0f);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_ui_text(prop,
"Default Weight A",
"Default weight a vertex will have if "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"it is not in the first A vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "default_weight_b", PROP_FLOAT, PROP_FACTOR);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_range(prop, 0.0, 1.0f);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b" also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
RNA_def_property_ui_text(prop,
"Default Weight B",
"Default weight a vertex will have if "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"it is not in the second B vgroup");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mix_mode", PROP_ENUM, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_enum_items(prop, weightvg_mix_modes_items);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop,
"Mix Mode",
"How weights from vgroup B affect weights "
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
"of vgroup A");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mix_set", PROP_ENUM, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_enum_items(prop, weightvg_mix_set_items);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Vertex Set", "Which vertices should be affected");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
prop = RNA_def_property(srna, "normalize", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WVG_MIX_WEIGHTS_NORMALIZE);
RNA_def_property_ui_text(
prop,
"Normalize Weights",
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
"Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
/* Common masking properties. */
rna_def_modifier_weightvg_mask(brna,
srna,
"flag",
"rna_WeightVGMixModifier_mask_defgrp_name_set",
"rna_WeightVGMixModifier_mask_tex_uvlayer_name_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_proximity_modes_items[] = {
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
{MOD_WVG_PROXIMITY_OBJECT,
"OBJECT",
0,
"Object",
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
"Use distance between affected and target objects"},
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
{MOD_WVG_PROXIMITY_GEOMETRY,
"GEOMETRY",
0,
"Geometry",
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
"Use distance between affected object's vertices and target "
"object, or target object's geometry"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem proximity_geometry_items[] = {
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
{MOD_WVG_PROXIMITY_GEOM_VERTS, "VERTEX", 0, "Vertex", "Compute distance to nearest vertex"},
{MOD_WVG_PROXIMITY_GEOM_EDGES, "EDGE", 0, "Edge", "Compute distance to nearest edge"},
{MOD_WVG_PROXIMITY_GEOM_FACES, "FACE", 0, "Face", "Compute distance to nearest face"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem weightvg_proximity_falloff_type_items[] = {
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_WVG_MAPPING_NONE, "LINEAR", ICON_LINCURVE, "Linear", "Null action"},
Add Custom Falloff Curve to the Vertex Weight Proximity Modifier. The Vertex Weight Edit Modifier already got the Custom Curve, there was no real reason for the proximity not to have it as well. With some fixes by Bastien Montagne (@mont29). Reviewed By: mont29 Differential Revision: https://developer.blender.org/D9594
2020-12-02 10:35:04 +01:00
{MOD_WVG_MAPPING_CURVE, "CURVE", ICON_RNDCURVE, "Custom Curve", ""},
VGroup Modifiers: added mapping options to proximity and edit. *Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one. *Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one! *Factorized the common mapping code into MOD_weightvg_util.
2011-09-05 16:16:00 +00:00
{MOD_WVG_MAPPING_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", ""},
{MOD_WVG_MAPPING_SMOOTH, "SMOOTH", ICON_SMOOTHCURVE, "Smooth", ""},
{MOD_WVG_MAPPING_ROOT, "ROOT", ICON_ROOTCURVE, "Root", ""},
{MOD_WVG_MAPPING_SPHERE, "ICON_SPHERECURVE", ICON_SPHERECURVE, "Sphere", ""},
{MOD_WVG_MAPPING_RANDOM, "RANDOM", ICON_RNDCURVE, "Random", ""},
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
{MOD_WVG_MAPPING_STEP,
"STEP",
UI: Weight Modifiers Falloff: Use better step icon
2020-06-18 12:44:03 -04:00
ICON_IPO_CONSTANT,
Fixed some glitches with WeightVG modifiers: * Added some RNA tooltips, now that they are supported by dropdown lists. * Fixed some RNA num properties UI steps. * Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
"Median Step",
"Map all values below 0.5 to 0.0, and all others to 1.0"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "VertexWeightProximityModifier", "Modifier");
vgroup_modifiers: Minor update (names...).
2011-08-18 06:30:59 +00:00
RNA_def_struct_ui_text(srna,
"WeightVG Proximity Modifier",
minor edits. - init proximity to 1.0f - min/max proximity dist were not being copied. - minor edits to comments - use ascii chars in a few places.
2011-09-05 03:09:49 +00:00
"Set the weights of vertices in a group from a target object's "
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
"distance");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_struct_sdna(srna, "WeightVGProximityModifierData");
interface + naming improvements to vertex wright modifier - WeightVG -> Vertex Weight - mapping_mode -> falloff_type - nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_VERTEX_WEIGHT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGProximityModifier_defgrp_name_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "proximity_mode", PROP_ENUM, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_enum_items(prop, weightvg_proximity_modes_items);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_enum_default(prop, MOD_WVG_PROXIMITY_GEOMETRY);
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Proximity Mode", "Which distances to target object to use");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "proximity_geometry", PROP_ENUM, PROP_NONE);
minor cleanup of rna - use an rna enum-set for proximity vert/edge/face options. - rename some flags. - better conform to rna naming conventions.
2011-07-28 01:38:48 +00:00
RNA_def_property_enum_sdna(prop, NULL, "proximity_flags");
RNA_def_property_enum_items(prop, proximity_geometry_items);
RNA_def_property_flag(prop, PROP_ENUM_FLAG); /* important to run before default set */
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_enum_default(prop, MOD_WVG_PROXIMITY_GEOM_FACES);
Vertex Weight Proximity: minor updates and fixes. *Updated UI code (replaced “row columns” by splits ;) ). *Clamped global influence to [0.0, 1.0] range! *Added/edited some tooltips for Proximity. *Proximity distance mapping can now be reversed by entering Lowest Dist > Highest Dist. *Moved mapping before masking in Proximity, much more sensible this way!
2011-09-08 07:36:59 +00:00
RNA_def_property_ui_text(prop,
"Proximity Geometry",
"Use the shortest computed distance to target object's geometry "
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
"as weight");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_pointer_sdna(prop, NULL, "proximity_ob_target");
/blender/makesrna: Removed final points in UI strings and messages. Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
RNA_def_property_ui_text(prop, "Target Object", "Object to calculate vertices distances from");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "min_dist", PROP_FLOAT, PROP_DISTANCE);
- mask_tex_map_obj --> mask_tex_map_object - dont allow negative min distances
2011-09-05 03:26:49 +00:00
RNA_def_property_range(prop, 0.0, FLT_MAX);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, -1);
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
RNA_def_property_ui_text(prop, "Lowest", "Distance mapping to weight 0.0");
vgroup_modifiers: Now clamping output values to [0.0, 1.0] range (and added min/max mapping values for Prowimity modif).
2011-08-08 21:12:51 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "max_dist", PROP_FLOAT, PROP_DISTANCE);
- mask_tex_map_obj --> mask_tex_map_object - dont allow negative min distances
2011-09-05 03:26:49 +00:00
RNA_def_property_range(prop, 0.0, FLT_MAX);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, -1);
UI / Modifiers: * VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through. * Do not use abbreviations like "Rem" or "Dist" in the UI... * Also small change for BEVEL modifier UI for more efficient space usage.
2013-06-08 16:06:39 +00:00
RNA_def_property_ui_text(prop, "Highest", "Distance mapping to weight 1.0");
vgroup_modifiers: Now clamping output values to [0.0, 1.0] range (and added min/max mapping values for Prowimity modif).
2011-08-08 21:12:51 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);
interface + naming improvements to vertex wright modifier - WeightVG -> Vertex Weight - mapping_mode -> falloff_type - nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
RNA_def_property_enum_items(prop, weightvg_proximity_falloff_type_items);
Fixed some UI message typos (spotted by Leon Cheung, thx).
2012-04-14 15:44:31 +00:00
RNA_def_property_ui_text(prop, "Falloff Type", "How weights are mapped to their new values");
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE); /* Abusing id_curve :/ */
VGroup Modifiers: added mapping options to proximity and edit. *Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one. *Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one! *Factorized the common mapping code into MOD_weightvg_util.
2011-09-05 16:16:00 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add invert mapping option to proximity weight edit modifier, and some cleanup.
2020-03-24 18:28:09 +01:00
prop = RNA_def_property(srna, "invert_falloff", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "proximity_flags", MOD_WVG_PROXIMITY_INVERT_FALLOFF);
RNA_def_property_ui_text(prop, "Invert Falloff", "Invert the resulting falloff weight");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
prop = RNA_def_property(srna, "normalize", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(
prop, NULL, "proximity_flags", MOD_WVG_PROXIMITY_WEIGHTS_NORMALIZE);
RNA_def_property_ui_text(
prop,
"Normalize Weights",
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
"Normalize the resulting weights (otherwise they are only clamped within 0.0 to 1.0 range)");
Modifiers: Add normalize weights option to vertex weight modifiers Original patch by Cody Winchester (@CodyWinch), several fixes and cleanup by Bastien Montagne (@mont29). Differential revision: https://developer.blender.org/D7656
2020-05-26 20:53:38 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Add Custom Falloff Curve to the Vertex Weight Proximity Modifier. The Vertex Weight Edit Modifier already got the Custom Curve, there was no real reason for the proximity not to have it as well. With some fixes by Bastien Montagne (@mont29). Reviewed By: mont29 Differential Revision: https://developer.blender.org/D9594
2020-12-02 10:35:04 +01:00
prop = RNA_def_property(srna, "map_curve", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "cmap_curve");
RNA_def_property_ui_text(prop, "Mapping Curve", "Custom mapping curve");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
/* Common masking properties. */
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
rna_def_modifier_weightvg_mask(brna,
srna,
Cleanup: factorize duplicated code in WVG modifiers' RNA.
2020-06-02 17:15:36 +02:00
"proximity_flags",
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
"rna_WeightVGProximityModifier_mask_defgrp_name_set",
"rna_WeightVGProximityModifier_mask_tex_uvlayer_name_set");
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
}
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
static void rna_def_modifier_remesh(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem mode_items[] = {
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
{MOD_REMESH_CENTROID, "BLOCKS", 0, "Blocks", "Output a blocky surface with no smoothing"},
{MOD_REMESH_MASS_POINT,
"SMOOTH",
0,
"Smooth",
"Output a smooth surface with no sharp-features detection"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_REMESH_SHARP_FEATURES,
"SHARP",
0,
"Sharp",
"Output a surface that reproduces sharp edges and corners from the input mesh"},
Add Voxel Mode to the Remesh modifier This adds the Voxel Mode to the current remesh modifier. It works exactly the same way as the voxel remesh operator and uses the same properties to control the remeshing. We can exand this with more options in the future (fix poles, reprojection...) Reviewed By: brecht Differential Revision: https://developer.blender.org/D7292
2020-03-31 17:06:17 +02:00
{MOD_REMESH_VOXEL,
"VOXEL",
0,
"Voxel",
"Output a mesh corresponding to the volume of the original mesh"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "RemeshModifier", "Modifier");
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_struct_ui_text(
srna,
"Remesh Modifier",
"Generate a new surface with regular topology that follows the shape of the input mesh");
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_struct_sdna(srna, "RemeshModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_REMESH);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_enum_items(prop, mode_items);
RNA_def_property_ui_text(prop, "Mode", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_ui_range(prop, 0, 0.99, 0.01, 3);
RNA_def_property_range(prop, 0, 0.99);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop, "Scale", "The ratio of the largest dimension of the model over the size of the grid");
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
RNA_def_property_range(prop, 0, 1);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Threshold",
"If removing disconnected pieces, minimum size of components to preserve as a ratio "
"of the number of polygons in the largest component");
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "octree_depth", PROP_INT, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_int_sdna(prop, NULL, "depth");
Increase hard limit for Remesher octree depth Adding more precision to help making watertight objects to be printed. Differential Revision: https://developer.blender.org/D8551
2020-07-27 16:03:32 +02:00
RNA_def_property_range(prop, 1, 24);
RNA_def_property_ui_range(prop, 1, 12, 1, 3);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_ui_text(
prop, "Octree Depth", "Resolution of the octree; higher values give finer details");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "sharpness", PROP_FLOAT, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_float_sdna(prop, NULL, "hermite_num");
RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Sharpness",
"Tolerance for outliers; lower values filter noise while higher values will reproduce "
"edges closer to the input");
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add Voxel Mode to the Remesh modifier This adds the Voxel Mode to the current remesh modifier. It works exactly the same way as the voxel remesh operator and uses the same properties to control the remeshing. We can exand this with more options in the future (fix poles, reprojection...) Reviewed By: brecht Differential Revision: https://developer.blender.org/D7292
2020-03-31 17:06:17 +02:00
prop = RNA_def_property(srna, "voxel_size", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "voxel_size");
Fix T77878: Hard minimum for voxel size of the remesh modifier This patch fixes T77878 in the same way that T72747 was fixed. A hard minimum for the voxel size was added to avoid an arithmetics error. Reviewed By: brecht Differential Revision: https://developer.blender.org/D8027
2020-06-15 13:51:30 +02:00
RNA_def_property_range(prop, 0.0001f, FLT_MAX);
Add Voxel Mode to the Remesh modifier This adds the Voxel Mode to the current remesh modifier. It works exactly the same way as the voxel remesh operator and uses the same properties to control the remeshing. We can exand this with more options in the future (fix poles, reprojection...) Reviewed By: brecht Differential Revision: https://developer.blender.org/D7292
2020-03-31 17:06:17 +02:00
RNA_def_property_ui_range(prop, 0.0001, 2, 0.1, 3);
RNA_def_property_ui_text(prop,
"Voxel Size",
"Size of the voxel in object space used for volume evaluation. Lower "
"values preserve finer details");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "adaptivity", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "adaptivity");
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
RNA_def_property_ui_text(
prop,
"Adaptivity",
"Reduces the final face count by simplifying geometry where detail is not needed, "
"generating triangles. A value greater than 0 disables Fix Poles");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
prop = RNA_def_property(srna, "use_remove_disconnected", PROP_BOOLEAN, PROP_NONE);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_REMESH_FLOOD_FILL);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(prop, "Remove Disconnected", "");
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add option for screw modifier to smooth shade. (renamed smooth_shading to use_smooth_shade for remesh modifier too)
2012-05-18 10:37:49 +00:00
prop = RNA_def_property(srna, "use_smooth_shade", PROP_BOOLEAN, PROP_NONE);
Add smooth-shading option for remesh modifier. The remesh modifier doesn't currently get any data from original faces, so even if the input mesh was entirely smooth none of the output faces would be. Solved by adding a new dna-flag/rna-bool/UI-checkbox to smooth shade the output. Requested by Daniel Salazar.
2012-05-18 06:10:47 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_REMESH_SMOOTH_SHADING);
RNA_def_property_ui_text(
prop, "Smooth Shading", "Output faces with smooth shading rather than flat shaded");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
}
=bmesh= Coded a new modifier, "Precision UV Interpolation", that triangulates, subdivides, then uses brecht's mean value interpolation to interpolate face data. Textures on ngon faces get interpolated a bit nicer, in other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
static void rna_def_modifier_ocean(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem geometry_items[] = {
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
{MOD_OCEAN_GEOM_GENERATE,
"GENERATE",
0,
"Generate",
"Generate ocean surface geometry at the specified resolution"},
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
{MOD_OCEAN_GEOM_DISPLACE,
"DISPLACE",
0,
"Displace",
"Displace existing geometry according to simulation"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
# if 0
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
{MOD_OCEAN_GEOM_SIM_ONLY,
"SIM_ONLY",
0,
"Sim Only",
"Leaves geometry unchanged, but still runs simulation (to be used from texture)"},
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
# endif
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Ocean: add new spectra modes to the ocean modifier This extends the ocean modifier to add new spectra (Pierson-Moskowitz, Jonswap, TMA). These models are very different to the Phillips spectrum. They are intended for more established, large area, oceans and/or shallow water situations.
2020-03-12 13:35:22 +11:00
static const EnumPropertyItem spectrum_items[] = {
{MOD_OCEAN_SPECTRUM_PHILLIPS,
"PHILLIPS",
0,
"Turbulent Ocean",
"Use for turbulent seas with foam"},
{MOD_OCEAN_SPECTRUM_PIERSON_MOSKOWITZ,
"PIERSON_MOSKOWITZ",
0,
"Established Ocean",
"Use for a large area, established ocean (Pierson-Moskowitz method)"},
{MOD_OCEAN_SPECTRUM_JONSWAP,
"JONSWAP",
0,
"Established Ocean (Sharp Peaks)",
"Use for sharp peaks ('JONSWAP', Pierson-Moskowitz method) with peak sharpening"},
{MOD_OCEAN_SPECTRUM_TEXEL_MARSEN_ARSLOE,
"TEXEL_MARSEN_ARSLOE",
0,
"Shallow Water",
"Use for shallow water ('JONSWAP', 'TMA' - Texel-Marsen-Arsloe method)"},
{0, NULL, 0, NULL, NULL},
};
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "OceanModifier", "Modifier");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_struct_ui_text(srna, "Ocean Modifier", "Simulate an ocean surface");
RNA_def_struct_sdna(srna, "OceanModifierData");
2.6 UI Modifier Icons: * New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself. * New Warp Icon, created by "Zafio" Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!
2012-02-12 19:57:47 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_OCEAN);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "geometry_mode", PROP_ENUM, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_enum_sdna(prop, NULL, "geometry_mode");
RNA_def_property_enum_items(prop, geometry_items);
RNA_def_property_ui_text(prop, "Geometry", "Method of modifying geometry");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "size");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(
prop, "Size", "Surface scale factor (does not affect the height of the waves)");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, -1);
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "repeat_x", PROP_INT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "repeat_x");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 1, 1024);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 100, 1, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_ui_text(prop, "Repeat X", "Repetitions of the generated surface in X");
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "repeat_y", PROP_INT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "repeat_y");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 1, 1024);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 100, 1, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_ui_text(prop, "Repeat Y", "Repetitions of the generated surface in Y");
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_normals", PROP_BOOLEAN, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_OCEAN_GENERATE_NORMALS);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
"Generate Normals",
"Output normals for bump mapping - disabling can speed up performance if its not needed");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_foam", PROP_BOOLEAN, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_OCEAN_GENERATE_FOAM);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(prop, "Generate Foam", "Generate foam mask as a vertex color channel");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Ocean modifier: Expose eigenvectors for use as map The eigenvectors in the ocean modifier (plus and minus) can be useful, but are not exposed. Assuming the particle system was capable, the eigenvectors could be used to drive spray emission velocities. This exposes the controls to allow a map to be generated from these eigenvectors. Currently, the values are mapped into a 0-255 range similar to foam. Differential Revision: https://developer.blender.org/D7182
2020-07-02 11:49:15 -04:00
prop = RNA_def_property(srna, "use_spray", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_OCEAN_GENERATE_SPRAY);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(
prop, "Generate Spray Map", "Generate map of spray direction as a vertex color channel");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
prop = RNA_def_property(srna, "invert_spray", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_OCEAN_INVERT_SPRAY);
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Ocean modifier: Expose eigenvectors for use as map The eigenvectors in the ocean modifier (plus and minus) can be useful, but are not exposed. Assuming the particle system was capable, the eigenvectors could be used to drive spray emission velocities. This exposes the controls to allow a map to be generated from these eigenvectors. Currently, the values are mapped into a 0-255 range similar to foam. Differential Revision: https://developer.blender.org/D7182
2020-07-02 11:49:15 -04:00
RNA_def_property_ui_text(prop, "Invert Spray", "Invert the spray direction map");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
prop = RNA_def_property(srna, "spray_layer_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "spraylayername");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Ocean modifier: Expose eigenvectors for use as map The eigenvectors in the ocean modifier (plus and minus) can be useful, but are not exposed. Assuming the particle system was capable, the eigenvectors could be used to drive spray emission velocities. This exposes the controls to allow a map to be generated from these eigenvectors. Currently, the values are mapped into a 0-255 range similar to foam. Differential Revision: https://developer.blender.org/D7182
2020-07-02 11:49:15 -04:00
RNA_def_property_ui_text(
prop, "Spray Map", "Name of the vertex color layer used for the spray direction map");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "resolution", PROP_INT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "resolution");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 1, 1024);
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 32, 1, -1);
Ocean Modifier: Add viewport resolution Following work done in 2.83, the resolution control is now a real level-of-detail parameter. It is now useful to be able to set the resolution for display independently from render. This is true for both mesh generation and mesh deformation modes. For compatibility with old scenes, resolution is retained and is the render resolution. Old modifiers loaded have the value of resolution also applied to viewport resolution. This allows newer modifiers to be used in older versions without trouble Differential Revision: https://developer.blender.org/D8336
2020-08-03 10:08:31 -04:00
RNA_def_property_ui_text(
prop, "Render Resolution", "Resolution of the generated surface for rendering and baking");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
prop = RNA_def_property(srna, "viewport_resolution", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "viewport_resolution");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 1, 1024);
RNA_def_property_ui_range(prop, 1, 32, 1, -1);
RNA_def_property_ui_text(
prop, "Viewport Resolution", "Viewport resolution of the generated surface");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
prop = RNA_def_property(srna, "spatial_size", PROP_INT, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "spatial_size");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 1, 512, 2, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(
prop,
"Spatial Size",
"Size of the simulation domain (in meters), and of the generated geometry (in BU)");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "wind_velocity", PROP_FLOAT, PROP_VELOCITY);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "wind_velocity");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Wind Velocity", "Wind speed");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "damping", PROP_FLOAT, PROP_FACTOR);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "damp");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(
prop, "Damping", "Damp reflected waves going in opposite direction to the wind");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "wave_scale_min", PROP_FLOAT, PROP_DISTANCE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "smallest_wave");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_range(prop, 0.0, FLT_MAX);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Smallest Wave", "Shortest allowed wavelength");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "wave_alignment", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "wave_alignment");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
UI: Use sliders and [0, 1] ranges in ocean modifier The ocean modifier has two properties that use a [0, 10] hard min and hard max. The values act as factors though, so it makes more sense to use sliders and a 0 to 1 range. This commit also bumps the file subversion to avoid repeatedly applying the change to the properties' range. Differential Revision: https://developer.blender.org/D8186
2020-07-03 10:28:13 -04:00
RNA_def_property_range(prop, 0.0, 1.0);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Wave Alignment", "How much the waves are aligned to each other");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "wave_direction", PROP_FLOAT, PROP_ANGLE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "wave_direction");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(
prop, "Wave Direction", "Main direction of the waves when they are (partially) aligned");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "wave_scale", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "wave_scale");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Wave Scale", "Scale of the displacement effect");
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
prop = RNA_def_property(srna, "depth", PROP_FLOAT, PROP_DISTANCE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "depth");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Depth", "Depth of the solid ground below the water surface");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 250, 1, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "foam_coverage", PROP_FLOAT, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "foam_coverage");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Foam Coverage", "Amount of generated foam");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "bake_foam_fade", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "foam_fade");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(
prop, "Foam Fade", "How much foam accumulates over time (baked ocean only)");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 10.0, 1, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "foam_layer_name", PROP_STRING, PROP_NONE);
Option to rename the vertex color data layer used by Ocean modifier for foam. The modifier outputs foam values to both textures and a (temporary) vertex data layer. This layer was unnamed before, which makes it impossible to access in shader nodes. Now the user can input a custom name in the modifier panel, then use that same name in a shader input node to access foam values. http://www.pasteall.org/pic/21120
2011-11-20 14:16:41 +00:00
RNA_def_property_string_sdna(prop, NULL, "foamlayername");
RNA_def_property_ui_text(
prop, "Foam Layer Name", "Name of the vertex color layer used for foam");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "choppiness", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "chop_amount");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(
prop,
"Choppiness",
"Choppiness of the wave's crest (adds some horizontal component to the displacement)");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0.0, 4.0, 3, -1);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_funcs(prop, NULL, "rna_OceanModifier_ocean_chop_set", NULL);
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "time", PROP_FLOAT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_float_sdna(prop, NULL, "time");
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Time", "Current time of the simulation");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, -1);
Ocean Modifier: removed unused refresh flags The flags were set and cleared correctly, but nothing was actually reading them.
2018-07-06 12:42:58 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Ocean: add new spectra modes to the ocean modifier This extends the ocean modifier to add new spectra (Pierson-Moskowitz, Jonswap, TMA). These models are very different to the Phillips spectrum. They are intended for more established, large area, oceans and/or shallow water situations.
2020-03-12 13:35:22 +11:00
prop = RNA_def_property(srna, "spectrum", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "spectrum");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Ocean: add new spectra modes to the ocean modifier This extends the ocean modifier to add new spectra (Pierson-Moskowitz, Jonswap, TMA). These models are very different to the Phillips spectrum. They are intended for more established, large area, oceans and/or shallow water situations.
2020-03-12 13:35:22 +11:00
RNA_def_property_enum_items(prop, spectrum_items);
RNA_def_property_ui_text(prop, "Spectrum", "Spectrum to use");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
prop = RNA_def_property(srna, "fetch_jonswap", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "fetch_jonswap");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Ocean: add new spectra modes to the ocean modifier This extends the ocean modifier to add new spectra (Pierson-Moskowitz, Jonswap, TMA). These models are very different to the Phillips spectrum. They are intended for more established, large area, oceans and/or shallow water situations.
2020-03-12 13:35:22 +11:00
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_text(
prop,
"Fetch",
"This is the distance from a lee shore, "
"called the fetch, or the distance over which the wind blows with constant velocity. "
"Used by 'JONSWAP' and 'TMA' models");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
prop = RNA_def_property(srna, "sharpen_peak_jonswap", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_float_sdna(prop, NULL, "sharpen_peak_jonswap");
Fix T78343: Most properties of Ocean modifier should not be animatable. Properties that are only used when initializing the simulation cannot be animated (the changes in their value would not be taken into account).
2020-09-25 17:26:52 +02:00
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
UI: Use sliders and [0, 1] ranges in ocean modifier The ocean modifier has two properties that use a [0, 10] hard min and hard max. The values act as factors though, so it makes more sense to use sliders and a 0 to 1 range. This commit also bumps the file subversion to avoid repeatedly applying the change to the properties' range. Differential Revision: https://developer.blender.org/D8186
2020-07-03 10:28:13 -04:00
RNA_def_property_range(prop, 0.0, 1.0);
Ocean: add new spectra modes to the ocean modifier This extends the ocean modifier to add new spectra (Pierson-Moskowitz, Jonswap, TMA). These models are very different to the Phillips spectrum. They are intended for more established, large area, oceans and/or shallow water situations.
2020-03-12 13:35:22 +11:00
RNA_def_property_ui_text(prop, "Sharpen peak", "Peak sharpening for 'JONSWAP' and 'TMA' models");
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "random_seed", PROP_INT, PROP_UNSIGNED);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "seed");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Random Seed", "Seed of the random generator");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "bakestart");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Bake Start", "Start frame of the ocean baking");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_int_sdna(prop, NULL, "bakeend");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Fix [#33189] AFTER 2.65 - Units in doc strings in ocean modifier. Also: * Fixes a (op prop) bug which prevented, once you had baked and freed ocean once, to bake again. * Fixed infinite values of acumulated foam when baking with foam_fade values above 1.0, now simply clipping accumulated foam value to 1.0, as already done for the "instantaneaous" foam value returned by BKE_ocean_jminus_to_foam(). * Added missing RNA descriptions. * Made foam_fade unanimatable! * Added in UI some missing properties that are imho useful: random seed, size (kindof 'surface scaling'), and foam_fade (baking only). * Removed custom lerp() func from bke's ocean.c, BLI's interpf does exactly the same thing (the first two args are just in reversed order). Note: this could most certainly be done in other parts of the code, bpy's mathutils for e.g. has its own linear interpolation code for vectors and matrices :/). * Did some general code cleanup (mostly line length and no C++ -> C comments)...
2013-01-02 16:03:58 +00:00
RNA_def_property_ui_text(prop, "Bake End", "End frame of the ocean baking");
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_update(prop, 0, "rna_OceanModifier_init_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "is_cached", PROP_BOOLEAN, PROP_NONE);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "cached", 1);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Fixes and tweaks to RNA messages (found while translating in french). Also setting better default values in WeightVGProximity modifier
2011-11-28 15:41:32 +00:00
RNA_def_property_ui_text(
prop, "Ocean is Cached", "Whether the ocean is using cached data or simulating");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
RNA_def_property_string_sdna(prop, NULL, "cachepath");
RNA_def_property_ui_text(prop, "Cache Path", "Path to a folder to store external baked images");
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
/*RNA_def_property_update(prop, 0, "rna_Modifier_update"); */
/* XXX how to update? */
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
}
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
static void rna_def_modifier_skin(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
style cleanup
2012-06-10 19:59:02 +00:00
srna = RNA_def_struct(brna, "SkinModifier", "Modifier");
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_struct_ui_text(srna, "Skin Modifier", "Generate Skin");
RNA_def_struct_sdna(srna, "SkinModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SKIN);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Changed percentage and 0-1 number fields to use sliders. This is more consistent. Reviewed by Brecht van Lommel, Thomas Dinges and Jonathan Williamson
2014-01-02 20:54:24 +01:00
prop = RNA_def_property(srna, "branch_smoothing", PROP_FLOAT, PROP_FACTOR);
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_property_ui_text(prop, "Branch Smoothing", "Smooth complex geometry around branches");
Fix #34875: 0 digits of precision was not supported for FloatProperty, now you can specify precision=0 for this, and use -1 for the default 2.
2013-04-08 18:55:08 +00:00
RNA_def_property_ui_range(prop, 0, 1, 1, -1);
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
prop = RNA_def_property(srna, "use_smooth_shade", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SKIN_SMOOTH_SHADING);
RNA_def_property_ui_text(
prop, "Smooth Shading", "Output faces with smooth shading rather than flat shaded");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
prop = RNA_def_property(srna, "use_x_symmetry", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "symmetry_axes", MOD_SKIN_SYMM_X);
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
2012-07-03 17:20:21 +00:00
RNA_def_property_ui_text(prop, "X", "Avoid making unsymmetrical quads across the X axis");
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
prop = RNA_def_property(srna, "use_y_symmetry", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "symmetry_axes", MOD_SKIN_SYMM_Y);
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
2012-07-03 17:20:21 +00:00
RNA_def_property_ui_text(prop, "Y", "Avoid making unsymmetrical quads across the Y axis");
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
prop = RNA_def_property(srna, "use_z_symmetry", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "symmetry_axes", MOD_SKIN_SYMM_Z);
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
2012-07-03 17:20:21 +00:00
RNA_def_property_ui_text(prop, "Z", "Avoid making unsymmetrical quads across the Z axis");
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
}
Triangulate modifier Useful for bump map baking where a consistent triangulation should be enforced when baking/exporting/importing, to avoid artifacts caused by a different triangulation of the mesh by that which was used for baking by internal/external tools. documentation is here http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/More_Features Will probably add some pictures too to demonstrate the issue that is solved more clearly. Currently using the skin modifier icon, will soon change that. Review by Brecht, thanks!
2012-11-19 20:40:08 +00:00
static void rna_def_modifier_triangulate(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Triangulate modifier Useful for bump map baking where a consistent triangulation should be enforced when baking/exporting/importing, to avoid artifacts caused by a different triangulation of the mesh by that which was used for baking by internal/external tools. documentation is here http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/More_Features Will probably add some pictures too to demonstrate the issue that is solved more clearly. Currently using the skin modifier icon, will soon change that. Review by Brecht, thanks!
2012-11-19 20:40:08 +00:00
srna = RNA_def_struct(brna, "TriangulateModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Triangulate Modifier", "Triangulate Mesh");
RNA_def_struct_sdna(srna, "TriangulateModifierData");
Custom icon for triangulate modifier.
2012-11-19 23:35:38 +00:00
RNA_def_struct_ui_icon(srna, ICON_MOD_TRIANGULATE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
prop = RNA_def_property(srna, "quad_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "quad_method");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_modifier_triangulate_quad_method_items);
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
RNA_def_property_ui_text(prop, "Quad Method", "Method for splitting the quads into triangles");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton
2013-10-29 02:42:51 +00:00
prop = RNA_def_property(srna, "ngon_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "ngon_method");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_modifier_triangulate_ngon_method_items);
UI messages fixes...
2013-11-04 18:58:22 +00:00
RNA_def_property_ui_text(
Use the term "N-gon" instead of "Polygon" for triangulation method This was reported for the Triangulate geometry node, but was also true for the triangulate modifier and in exporters. Note the modifier was introduced with "Ngon Method" in rBa7b44c82e5b9 but was renamed to "Polygon Method" in rBf4762eb12ba5. Since quads are also polygons (and quads have their own method), the term "N-gon" is more appropriate here and is also described in the glossary https://docs.blender.org/manual/en/2.92/glossary/ index.html#term-N-gon Docs have been updated in rBM7539 (partially - the method would also have to be renamed once this patch lands). Note this also fixes the wrong enum used for the alembic exporter. Fixes T83907 Maniphest Tasks: T83907 Differential Revision: https://developer.blender.org/D10022
2021-01-06 16:19:22 +01:00
prop, "N-gon Method", "Method for splitting the n-gons into triangles");
Triangulate modifier Useful for bump map baking where a consistent triangulation should be enforced when baking/exporting/importing, to avoid artifacts caused by a different triangulation of the mesh by that which was used for baking by internal/external tools. documentation is here http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/More_Features Will probably add some pictures too to demonstrate the issue that is solved more clearly. Currently using the skin modifier icon, will soon change that. Review by Brecht, thanks!
2012-11-19 20:40:08 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: add minimum number of vertices to triangulate modifier. This lets you only triangulate n-gons when setting the number to 5 or more. Differential Revision: https://developer.blender.org/D4367
2019-03-22 17:55:51 +01:00
prop = RNA_def_property(srna, "min_vertices", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "min_vertices");
RNA_def_property_range(prop, 4, INT_MAX);
RNA_def_property_ui_text(
prop,
"Minimum Vertices",
"Triangulate only polygons with vertex count greater than or equal to this number");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
'Fix' T61942: Triangulate modifier breaks custom normals. Not a bug, but supporting preservation of custom normals in that specific modifier makes sense, in game pipeline contexts. Could also ease work of IO add-ons that want to export triangulated geometry...
2019-02-28 18:03:48 +01:00
prop = RNA_def_property(srna, "keep_custom_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_TRIANGULATE_KEEP_CUSTOMLOOP_NORMALS);
RNA_def_property_ui_text(
prop,
"Keep Normals",
"Try to preserve custom normals (WARNING: depending on chosen triangulation method, "
"shading may not be fully preserved, 'Fixed' method usually gives the best result here)");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Triangulate modifier Useful for bump map baking where a consistent triangulation should be enforced when baking/exporting/importing, to avoid artifacts caused by a different triangulation of the mesh by that which was used for baking by internal/external tools. documentation is here http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/More_Features Will probably add some pictures too to demonstrate the issue that is solved more clearly. Currently using the skin modifier icon, will soon change that. Review by Brecht, thanks!
2012-11-19 20:40:08 +00:00
}
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
static void rna_def_modifier_meshcache(BlenderRNA *brna)
{
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_format_type_items[] = {
UI: Fixes and small improvements to some labels and UI messages Small tweaks to make labels and texts more correct, consistent and polished. Reviewed by: Aaron Carlisle, Julian Eisel Differential Revision: https://developer.blender.org/D8346
2020-08-06 14:48:47 +02:00
{MOD_MESHCACHE_TYPE_MDD, "MDD", 0, "MDD", ""},
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
{MOD_MESHCACHE_TYPE_PC2, "PC2", 0, "PC2", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_deform_mode_items[] = {
add 'deform - integrate' option to mesh-cache, This means the deformation on the input to the modifier can be re-applied ontop of the mesh cache. In practice this is most useful for using corrective shape-keys with mesh-cache.
2013-01-24 04:02:30 +00:00
{MOD_MESHCACHE_DEFORM_OVERWRITE,
"OVERWRITE",
0,
"Overwrite",
"Replace vertex coords with cached values"},
{MOD_MESHCACHE_DEFORM_INTEGRATE,
"INTEGRATE",
0,
"Integrate",
"Integrate deformation from this modifiers input with the mesh-cache coords (useful for "
"shape keys)"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
add 'deform - integrate' option to mesh-cache, This means the deformation on the input to the modifier can be re-applied ontop of the mesh cache. In practice this is most useful for using corrective shape-keys with mesh-cache.
2013-01-24 04:02:30 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_interpolation_type_items[] = {
UI: Fixes and small improvements to some labels and UI messages Small tweaks to make labels and texts more correct, consistent and polished. Reviewed by: Aaron Carlisle, Julian Eisel Differential Revision: https://developer.blender.org/D8346
2020-08-06 14:48:47 +02:00
{MOD_MESHCACHE_INTERP_NONE, "NONE", 0, "None", ""},
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
{MOD_MESHCACHE_INTERP_LINEAR, "LINEAR", 0, "Linear", ""},
/* for cardinal we'd need to read 4x cache's */
// {MOD_MESHCACHE_INTERP_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_time_type_items[] = {
Usual minor UI messages fixes...
2013-01-21 16:25:25 +00:00
/* use 'eval_frame' */
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
{MOD_MESHCACHE_TIME_FRAME,
"FRAME",
0,
"Frame",
"Control playback using a frame-number "
Usual minor UI messages fixes...
2013-01-21 16:25:25 +00:00
"(ignoring time FPS and start frame from the file)"},
/* use 'eval_time' */
{MOD_MESHCACHE_TIME_SECONDS, "TIME", 0, "Time", "Control playback using time in seconds"},
/* use 'eval_factor' */
{MOD_MESHCACHE_TIME_FACTOR,
"FACTOR",
0,
"Factor",
UI: Consistent Range Descriptions Unifying range descriptions as a value 'to' a value. Differential Revision: https://developer.blender.org/D9771 Reviewed by Julian Eisel
2020-12-11 07:35:44 -08:00
"Control playback using a value between 0 and 1"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
};
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_time_play_items[] = {
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
{MOD_MESHCACHE_PLAY_CFEA, "SCENE", 0, "Scene", "Use the time from the scene"},
Usual minor UI messages fixes...
2013-01-21 16:25:25 +00:00
{MOD_MESHCACHE_PLAY_EVAL, "CUSTOM", 0, "Custom", "Use the modifier's own time evaluation"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
srna = RNA_def_struct(brna, "MeshCacheModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Cache Modifier", "Cache Mesh");
RNA_def_struct_sdna(srna, "MeshCacheModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "cache_format", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "type");
RNA_def_property_enum_items(prop, prop_format_type_items);
RNA_def_property_ui_text(prop, "Format", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "interpolation", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "interp");
RNA_def_property_enum_items(prop, prop_interpolation_type_items);
RNA_def_property_ui_text(prop, "Interpolation", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "time_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "time_mode");
RNA_def_property_enum_items(prop, prop_time_type_items);
RNA_def_property_ui_text(prop, "Time Mode", "Method to control playback time");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "play_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "play_mode");
RNA_def_property_enum_items(prop, prop_time_play_items);
Fix: Wrong UI Label for mesh cache play mode
2020-06-07 19:09:35 -04:00
RNA_def_property_ui_text(prop, "Play Mode", "");
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add 'deform - integrate' option to mesh-cache, This means the deformation on the input to the modifier can be re-applied ontop of the mesh cache. In practice this is most useful for using corrective shape-keys with mesh-cache.
2013-01-24 04:02:30 +00:00
prop = RNA_def_property(srna, "deform_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "deform_mode");
RNA_def_property_enum_items(prop, prop_deform_mode_items);
RNA_def_property_ui_text(prop, "Deform Mode", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
RNA_def_property_ui_text(prop, "File Path", "Path to external displacements file");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
add an influence slider to mesh cache.
2013-01-21 16:43:04 +00:00
prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "factor");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Influence", "Influence of the deformation");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
/* -------------------------------------------------------------------- */
/* Axis Conversion */
prop = RNA_def_property(srna, "forward_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "forward_axis");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_axis_items);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_ui_text(prop, "Forward", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "up_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "up_axis");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_axis_items);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_ui_text(prop, "Up", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "flip_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "flip_axis");
Select mirror multiple axis support Previously you could only select mirror on X axis, now support mirroring on multiple axis as well as more than one (for mesh and lattice data).
2016-01-07 20:54:17 +11:00
RNA_def_property_enum_items(prop, rna_enum_axis_flag_xyz_items);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_ui_text(prop, "Flip Axis", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
/* -------------------------------------------------------------------- */
/* For Scene time */
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_float_sdna(prop, NULL, "frame_start");
RNA_def_property_range(prop, -MAXFRAME, MAXFRAME);
RNA_def_property_ui_text(prop, "Frame Start", "Add this to the start frame");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "frame_scale", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "frame_scale");
RNA_def_property_range(prop, 0.0f, 100.0f);
RNA_def_property_ui_text(prop, "Frame Scale", "Evaluation time in seconds");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
/* -------------------------------------------------------------------- */
/* eval values depend on 'time_mode' */
prop = RNA_def_property(srna, "eval_frame", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "eval_frame");
RNA_def_property_range(prop, MINFRAME, MAXFRAME);
Usual minor UI messages fixes...
2013-01-21 16:25:25 +00:00
RNA_def_property_ui_text(prop, "Evaluation Frame", "The frame to evaluate (starting at 0)");
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
prop = RNA_def_property(srna, "eval_time", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "eval_time");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_text(prop, "Evaluation Time", "Evaluation time in seconds");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: use factor when appropriate - Many factor properties were set to PROP_NONE, even properties that had 'Factor' in the name! - Some time properties were not set to PROP_TIME, especially in Particles. - Changed motion_blur_shutter to use a soft max value of 1 instead of 2. Anything > 1 here is not physically correct and makes no real logical sense. - Changed display name of Dynamic Paint dissolve_speed to Dissolve Time, since it's a time property, not speed.
2019-02-20 10:15:27 +11:00
prop = RNA_def_property(srna, "eval_factor", PROP_FLOAT, PROP_FACTOR);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
RNA_def_property_float_sdna(prop, NULL, "eval_factor");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Evaluation Factor", "Evaluation time in seconds");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
}
Cycles: add support for rendering deformation motion blur from Alembic caches. This patch adds the ability to render motion blur from Alembic caches. The motion blur data is derived from a velocity attribute whose name has to be defined by the user through the MeshSequenceCache modifier, with a default value of ".velocities", which is the standard name in Alembic for the velocity property, although other software may ignore it and write velocity with their own naming convention (e.g. "v" in Houdini). Furthermore, a property was added to define how the velocity vectors are interpreted with regard to time : frame or second. "Frame" means that the velocity is already scaled by the time step and we do not need to modify it for it to look proper. "Second" means that the unit the velocity was measured in is in seconds and so has to be scaled by some time step computed here as being the time between two frames (1 / FPS, which would be typical for a simulation). This appears to be common, and is the default behavior. Another property was added to control the scale of the velocity to further modify the look of the motion blur. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D2388
2020-08-03 03:28:04 +02:00
static void rna_def_mesh_cache_velocities(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "MeshCacheVertexVelocity", NULL);
RNA_def_struct_ui_text(srna, "Mesh Cache Velocity", "Velocity attribute of an Alembic mesh");
RNA_def_struct_ui_icon(srna, ICON_VERTEXSEL);
prop = RNA_def_property(srna, "velocity", PROP_FLOAT, PROP_VELOCITY);
RNA_def_property_array(prop, 3);
RNA_def_property_float_sdna(prop, NULL, "vel");
RNA_def_property_ui_text(prop, "Velocity", "");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
}
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
static void rna_def_modifier_meshseqcache(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
srna = RNA_def_struct(brna, "MeshSequenceCacheModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Cache Modifier", "Cache Mesh");
RNA_def_struct_sdna(srna, "MeshSeqCacheModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
prop = RNA_def_property(srna, "cache_file", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "cache_file");
RNA_def_property_struct_type(prop, "CacheFile");
RNA_def_property_ui_text(prop, "Cache File", "");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
prop = RNA_def_property(srna, "object_path", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(
prop,
"Object Path",
"Path to the object in the Alembic archive used to lookup geometric data");
Alembic: integrate cache file into the dependency graph * The cache file datablock is now evaluated as part of the dependency graph, creating/freeing the Alembic file handle matching the current frame. Modifiers and constraints depend on this evaluation. * Cache file handles and readers now only exist on COW datablocks, never the original ones. * Object data paths are flushed back to the original for the user interface. * The cache file keeps a list of all readers associated with its handle, and automatically frees them when the handle is freed. This kind of sharing of data across datablocks is weak but we have no better mechanism for it. Fix T62720: Alembic sequences not working and crashing Differential Revision: https://developer.blender.org/D4774
2019-04-04 15:07:37 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem read_flag_items[] = {
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
{MOD_MESHSEQ_READ_VERT, "VERT", 0, "Vertex", ""},
{MOD_MESHSEQ_READ_POLY, "POLY", 0, "Faces", ""},
{MOD_MESHSEQ_READ_UV, "UV", 0, "UV", ""},
{MOD_MESHSEQ_READ_COLOR, "COLOR", 0, "Color", ""},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
prop = RNA_def_property(srna, "read_data", PROP_ENUM, PROP_NONE);
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "read_flag");
RNA_def_property_enum_items(prop, read_flag_items);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_ui_text(prop, "Read Data", "Data to read from the cache");
Fix T71981: Alembic vertex interpolation can jumble mesh Add an option to disable Alembic vertex interpolation. Bump subversion from 5 to 6. Alembic stores mesh samples at specific time keys; when a frame in Blender maps to a timecode between two samples, Blender will interpolate the mesh vertex positions. This interpolation only happens when the mesh has a constant topology, but sometimes this was not detected properly when the vertices change order, but the number of mesh elements remains the same. This would result in a mesh with jumbled up vertices (T71981). With this patch, users have the ability to disable vertex interpolation. An alternative would be to have better detection of topology changes, but that that'll cause a considerable slowdown. Maniphest Tasks: T71981 Differential Revision: https://developer.blender.org/D9041
2020-09-29 14:34:01 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
Fix T71981: Alembic vertex interpolation can jumble mesh Add an option to disable Alembic vertex interpolation. Bump subversion from 5 to 6. Alembic stores mesh samples at specific time keys; when a frame in Blender maps to a timecode between two samples, Blender will interpolate the mesh vertex positions. This interpolation only happens when the mesh has a constant topology, but sometimes this was not detected properly when the vertices change order, but the number of mesh elements remains the same. This would result in a mesh with jumbled up vertices (T71981). With this patch, users have the ability to disable vertex interpolation. An alternative would be to have better detection of topology changes, but that that'll cause a considerable slowdown. Maniphest Tasks: T71981 Differential Revision: https://developer.blender.org/D9041
2020-09-29 14:34:01 +02:00
prop = RNA_def_property(srna, "use_vertex_interpolation", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "read_flag", MOD_MESHSEQ_INTERPOLATE_VERTICES);
RNA_def_property_ui_text(
Cleanup: remove full-stop from description
2020-09-30 12:22:24 +10:00
prop, "Vertex Interpolation", "Allow interpolation of vertex positions");
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
Cycles: add support for rendering deformation motion blur from Alembic caches. This patch adds the ability to render motion blur from Alembic caches. The motion blur data is derived from a velocity attribute whose name has to be defined by the user through the MeshSequenceCache modifier, with a default value of ".velocities", which is the standard name in Alembic for the velocity property, although other software may ignore it and write velocity with their own naming convention (e.g. "v" in Houdini). Furthermore, a property was added to define how the velocity vectors are interpreted with regard to time : frame or second. "Frame" means that the velocity is already scaled by the time step and we do not need to modify it for it to look proper. "Second" means that the unit the velocity was measured in is in seconds and so has to be scaled by some time step computed here as being the time between two frames (1 / FPS, which would be typical for a simulation). This appears to be common, and is the default behavior. Another property was added to control the scale of the velocity to further modify the look of the motion blur. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D2388
2020-08-03 03:28:04 +02:00
prop = RNA_def_property(srna, "velocity_scale", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "velocity_scale");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_text(
prop,
"Velocity Scale",
"Multiplier used to control the magnitude of the velocity vectors for time effects");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* -------------------------- Velocity Vectors -------------------------- */
prop = RNA_def_property(srna, "vertex_velocities", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "vertex_velocities", "num_vertices");
RNA_def_property_struct_type(prop, "MeshCacheVertexVelocity");
RNA_def_property_ui_text(
prop, "Fluid Mesh Vertices", "Vertices of the fluid mesh generated by simulation");
rna_def_mesh_cache_velocities(brna);
prop = RNA_def_property(srna, "has_velocity", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop, "Has Velocity Cache", "");
RNA_def_property_boolean_funcs(prop, "rna_MeshSequenceCacheModifier_has_velocity_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "read_velocity", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop, "Read Velocity Cache", "");
RNA_def_property_boolean_funcs(prop, "rna_MeshSequenceCacheModifier_read_velocity_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
}
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
static void rna_def_modifier_laplaciandeform(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
srna = RNA_def_struct(brna, "LaplacianDeformModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Laplacian Deform Modifier", "Mesh deform modifier");
RNA_def_struct_sdna(srna, "LaplacianDeformModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "anchor_grp_name");
RNA_def_property_ui_text(
UI: Clarify Laplacian Deform - Match UI Style - Clarify that the vertex group is different then other modifiers
2020-02-26 17:33:17 -05:00
prop, "Anchor Weights", "Name of Vertex Group which determines Anchors");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(
prop, NULL, NULL, "rna_LaplacianDeformModifier_anchor_grp_name_set");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "repeat");
RNA_def_property_ui_range(prop, 1, 50, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
prop = RNA_def_property(srna, "is_bind", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_LaplacianDeformModifier_is_bind_get", NULL);
Usual ui messages fixes...
2013-11-25 22:23:36 +01:00
RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to anchors");
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifiers: Laplacian Deform modifier add invert vgroup option Adds the invert vgroup option to the Laplacian Deform modifier. Differential Revision: https://developer.blender.org/D6843
2020-02-18 16:54:00 +01:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_LAPLACIANDEFORM_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}
Cleanup: Organize Weld Modifier in alphabetical order
2020-03-31 20:39:37 -03:00
static void rna_def_modifier_weld(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
Modifier: Add "Connected" mode to the weld modifier Implement improvement from T73139 for merging along edges. It is now called "Connected" mode, while the default is called "All". With the recent performance improvement, the Connected Mode is in some cases only double the speed than the usual merge all strategy but in other cases it may be even faster. The bottleneck is somewhere further down the line of merging geometry. The motivation for this patch came from T80897, because the merging in complex solidify is making it very slow. Now merging can be removed from solidify without greater consequences, as this is just a quicker and more advanced algorithm to do the same thing that solidify currently does slowly. Reviewed by: mano-wii, campbellbarton Ref D8966
2020-12-09 11:10:15 +11:00
static const EnumPropertyItem mode_items[] = {
Cleanup: use common 'MOD_WELD_MODE_' prefix
2020-12-09 14:10:30 +11:00
{MOD_WELD_MODE_ALL, "ALL", 0, "All", "Full merge by distance"},
{MOD_WELD_MODE_CONNECTED, "CONNECTED", 0, "Connected", "Only merge along the edges"},
Modifier: Add "Connected" mode to the weld modifier Implement improvement from T73139 for merging along edges. It is now called "Connected" mode, while the default is called "All". With the recent performance improvement, the Connected Mode is in some cases only double the speed than the usual merge all strategy but in other cases it may be even faster. The bottleneck is somewhere further down the line of merging geometry. The motivation for this patch came from T80897, because the merging in complex solidify is making it very slow. Now merging can be removed from solidify without greater consequences, as this is just a quicker and more advanced algorithm to do the same thing that solidify currently does slowly. Reviewed by: mano-wii, campbellbarton Ref D8966
2020-12-09 11:10:15 +11:00
{0, NULL, 0, NULL, NULL},
};
Cleanup: Organize Weld Modifier in alphabetical order
2020-03-31 20:39:37 -03:00
srna = RNA_def_struct(brna, "WeldModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Weld Modifier", "Weld modifier");
RNA_def_struct_sdna(srna, "WeldModifierData");
RNA_def_struct_ui_icon(srna, ICON_AUTOMERGE_OFF);
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Modifier: Add "Connected" mode to the weld modifier Implement improvement from T73139 for merging along edges. It is now called "Connected" mode, while the default is called "All". With the recent performance improvement, the Connected Mode is in some cases only double the speed than the usual merge all strategy but in other cases it may be even faster. The bottleneck is somewhere further down the line of merging geometry. The motivation for this patch came from T80897, because the merging in complex solidify is making it very slow. Now merging can be removed from solidify without greater consequences, as this is just a quicker and more advanced algorithm to do the same thing that solidify currently does slowly. Reviewed by: mano-wii, campbellbarton Ref D8966
2020-12-09 11:10:15 +11:00
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, mode_items);
RNA_def_property_ui_text(prop, "Mode", "Mode defines the merge rule");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Cleanup: Organize Weld Modifier in alphabetical order
2020-03-31 20:39:37 -03:00
prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "merge_dist");
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 1, 0.001, 6);
RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop, "Vertex Group", "Vertex group name for selecting the affected areas");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeldModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WELD_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Cleanup: Organize Weld Modifier in alphabetical order
2020-03-31 20:39:37 -03:00
}
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
static void rna_def_modifier_wireframe(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
srna = RNA_def_struct(brna, "WireframeModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Wireframe Modifier", "Wireframe effect modifier");
RNA_def_struct_sdna(srna, "WireframeModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_WIREFRAME);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
RNA: use distance units
2019-02-18 14:56:37 +11:00
prop = RNA_def_property(srna, "thickness", PROP_FLOAT, PROP_DISTANCE);
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_float_sdna(prop, NULL, "offset");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01, 4);
RNA_def_property_ui_text(prop, "Thickness", "Thickness factor");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "thickness_vertex_group", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "offset_fac_vg");
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
RNA_def_property_ui_text(
prop, "Vertex Group Factor", "Thickness factor to use for zero vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "offset_fac");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -1, 1, 0.1, 4);
RNA_def_property_ui_text(prop, "Offset", "Offset the thickness from the center");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "use_replace", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_REPLACE);
RNA_def_property_ui_text(prop, "Replace", "Remove original geometry");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "use_boundary", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_BOUNDARY);
RNA_def_property_ui_text(prop, "Boundary", "Support face boundaries");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "use_even_offset", PROP_BOOLEAN, PROP_NONE);
error in last commit, flag names.
2013-12-22 07:16:41 +11:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_OFS_EVEN);
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_ui_text(prop, "Offset Even", "Scale the offset to give more even thickness");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE);
error in last commit, flag names.
2013-12-22 07:16:41 +11:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_OFS_RELATIVE);
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_ui_text(prop, "Offset Relative", "Scale the offset by surrounding geometry");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "use_crease", PROP_BOOLEAN, PROP_NONE);
error in last commit, flag names.
2013-12-22 07:16:41 +11:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_CREASE);
Various UI messages fixes...
2020-06-15 10:51:26 +02:00
RNA_def_property_ui_text(
prop, "Offset Relative", "Crease hub edges for improved subdivision surface");
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "crease_weight", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "crease_weight");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 1);
Usual UI messages fixes.
2014-01-21 20:18:07 +01:00
RNA_def_property_ui_text(prop, "Weight", "Crease weight (if active)");
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "material_offset", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "mat_ofs");
RNA_def_property_range(prop, SHRT_MIN, SHRT_MAX);
RNA_def_property_ui_text(prop, "Material Offset", "Offset material index of generated faces");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop, "Vertex Group", "Vertex group name for selecting the affected areas");
Cleanup: factorize RNA accessor code of modifiers (saves over 160 lines of dummy code!) Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D364
2014-03-18 17:17:51 +01:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WireframeModifier_defgrp_name_set");
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Modifier: New Wireframe Modifier Based on patch originally by Thomas Beck, uses options similar to solidify.
2013-12-22 07:08:35 +11:00
}
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
static void rna_def_modifier_datatransfer(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem DT_layer_vert_items[] = {
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
{DT_TYPE_MDEFORMVERT,
"VGROUP_WEIGHTS",
0,
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
"Vertex Groups",
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
"Transfer active or all vertex groups"},
# if 0 /* TODO */
{DT_TYPE_SHAPEKEY, "SHAPEKEYS", 0, "Shapekey(s)", "Transfer active or all shape keys"},
# endif
Cleanup: comments (mainly long lines) Comments after code can cause awkward line breaks.
2019-04-21 13:44:06 +10:00
/* XXX When SkinModifier is enabled,
* it seems to erase its own CD_MVERT_SKIN layer from final DM :( */
# if 0
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{DT_TYPE_SKIN, "SKIN", 0, "Skin Weight", "Transfer skin weights"},
# endif
{DT_TYPE_BWEIGHT_VERT, "BEVEL_WEIGHT_VERT", 0, "Bevel Weight", "Transfer bevel weights"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem DT_layer_edge_items[] = {
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{DT_TYPE_SHARP_EDGE, "SHARP_EDGE", 0, "Sharp", "Transfer sharp mark"},
{DT_TYPE_SEAM, "SEAM", 0, "UV Seam", "Transfer UV seam mark"},
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
{DT_TYPE_CREASE, "CREASE", 0, "Crease", "Transfer subdivision crease values"},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{DT_TYPE_BWEIGHT_EDGE, "BEVEL_WEIGHT_EDGE", 0, "Bevel Weight", "Transfer bevel weights"},
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
{DT_TYPE_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle", "Transfer Freestyle edge mark"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem DT_layer_loop_items[] = {
Add Custom Loop Normals to Data Transfer. Titles says everything, just two notes: * We have to actually transfer plain *normals*, not 'compressed' clnors, so had to add pre/post process to transfer to make the conversions. * Also added interpolation and advanced copy/mixing to CD_NORMAL, for same reasons.
2015-02-05 14:38:59 +01:00
{DT_TYPE_LNOR, "CUSTOM_NORMAL", 0, "Custom Normals", "Transfer custom normals"},
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
{DT_TYPE_VCOL, "VCOL", 0, "Vertex Colors", "Vertex (face corners) colors"},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem DT_layer_poly_items[] = {
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
{DT_TYPE_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer flat/smooth mark"},
{DT_TYPE_FREESTYLE_FACE,
"FREESTYLE_FACE",
0,
"Freestyle Mark",
"Transfer Freestyle face mark"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
srna = RNA_def_struct(brna, "DataTransferModifier", "Modifier");
RNA_def_struct_ui_text(
srna, "Data Transfer Modifier", "Modifier transferring some data from a source mesh");
RNA_def_struct_sdna(srna, "DataTransferModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_DATA_TRANSFER);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "ob_source");
RNA_def_property_ui_text(prop, "Source Object", "Object to transfer data from");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_pointer_funcs(
prop, NULL, "rna_DataTransferModifier_ob_source_set", NULL, "rna_Mesh_object_poll");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_boolean(srna,
"use_object_transform",
true,
"Object Transform",
Fix T45088: Wrong tooltip for 'Object Transform' option of transfer data.
2015-06-16 14:17:26 +02:00
"Evaluate source and destination meshes in global space");
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_OBSRC_TRANSFORM);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* Generic, UI-only data types toggles. */
prop = RNA_def_boolean(
srna, "use_vert_data", false, "Vertex Data", "Enable vertex data transfer");
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_USE_VERT);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_use_data_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_boolean(srna, "use_edge_data", false, "Edge Data", "Enable edge data transfer");
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_USE_EDGE);
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_use_data_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_boolean(
srna, "use_loop_data", false, "Face Corner Data", "Enable face corner data transfer");
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_USE_LOOP);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_use_data_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_boolean(srna, "use_poly_data", false, "Face Data", "Enable face data transfer");
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_USE_POLY);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_use_data_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* Actual data types selection. */
prop = RNA_def_enum(srna,
"data_types_verts",
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
DT_layer_vert_items,
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
0,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Vertex Data Types",
"Which vertex data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_verts_data_types_set", NULL);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_enum(srna,
"data_types_edges",
DT_layer_edge_items,
0,
"Edge Data Types",
"Which edge data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_edges_data_types_set", NULL);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_enum(srna,
"data_types_loops",
DT_layer_loop_items,
0,
"Face Corner Data Types",
"Which face corner data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_loops_data_types_set", NULL);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_enum(srna,
"data_types_polys",
DT_layer_poly_items,
0,
"Poly Data Types",
"Which poly data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script (if they're on different properties). This patch basically gets rid of (ui-related) hack where we was adding specific 'fake' enums for datatypes needing additional options. That was done because of broken UI code - to summarize, 'align' code did not support correctly layout mixing vertical and horizontal sub-layouts, in particular if it was 'column-major'. A complete rewrite of this align code has been done, so now we can use a more sane UI code.
2015-10-19 23:22:12 +02:00
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_polys_data_types_set", NULL);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* Mapping methods. */
prop = RNA_def_enum(srna,
"vert_mapping",
rna_enum_dt_method_vertex_items,
MREMAP_MODE_VERT_NEAREST,
"Vertex Mapping",
"Method used to map source vertices to destination ones");
RNA_def_property_enum_sdna(prop, NULL, "vmap_mode");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"edge_mapping",
rna_enum_dt_method_edge_items,
MREMAP_MODE_EDGE_NEAREST,
"Edge Mapping",
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Method used to map source edges to destination ones");
RNA_def_property_enum_sdna(prop, NULL, "emap_mode");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"loop_mapping",
rna_enum_dt_method_loop_items,
MREMAP_MODE_LOOP_NEAREST_POLYNOR,
"Face Corner Mapping",
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Method used to map source faces' corners to destination ones");
RNA_def_property_enum_sdna(prop, NULL, "lmap_mode");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"poly_mapping",
rna_enum_dt_method_poly_items,
MREMAP_MODE_POLY_NEAREST,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Face Mapping",
"Method used to map source faces to destination ones");
RNA_def_property_enum_sdna(prop, NULL, "pmap_mode");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
/* Mapping options and filtering. */
prop = RNA_def_boolean(
srna,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"use_max_distance",
false,
"Only Neighbor Geometry",
"Source elements must be closer than given distance from destination one");
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_MAP_MAXDIST);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
EditNormal modifier: add some 'maximum angle' limit. Allows to avoid generating flipped faces when using extreme normal modifications. Related to T48576.
2016-06-06 21:41:17 +02:00
prop = RNA_def_float(
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
srna,
"max_distance",
1.0f,
0.0f,
FLT_MAX,
"Max Distance",
"Maximum allowed distance between source and destination element, for non-topology mappings",
0.0f,
100.0f);
RNA_def_property_float_sdna(prop, NULL, "map_max_distance");
RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_float(
srna,
"ray_radius",
0.0f,
0.0f,
FLT_MAX,
"Ray Radius",
"'Width' of rays (especially useful when raycasting against vertices or edges)",
0.0f,
10.0f);
RNA_def_property_float_sdna(prop, NULL, "map_ray_radius");
RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_float(
srna,
"islands_precision",
0.0f,
0.0f,
1.0f,
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
"Islands Precision",
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Factor controlling precision of islands handling "
"(typically, 0.1 should be enough, higher values can make things really slow)",
0.0f,
1.0f);
RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* How to handle multi-layers types of data. */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_vgroup_select_src",
rna_enum_dt_layers_select_src_items,
DT_LAYERS_ALL_SRC,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Source Layers Selection",
"Which layers to transfer, in case of multi-layers types");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_src[DT_MULTILAYER_INDEX_MDEFORMVERT]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
# if 0
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
prop = RNA_def_enum(srna,
"layers_shapekey_select_src",
rna_enum_dt_layers_select_src_items,
DT_LAYERS_ALL_SRC,
"Source Layers Selection",
"Which layers to transfer, in case of multi-layers types");
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_enum_sdna(prop, NULL, "layers_select_src[DT_MULTILAYER_INDEX_SHAPEKEY]");
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf");
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
# endif
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_vcol_select_src",
rna_enum_dt_layers_select_src_items,
DT_LAYERS_ALL_SRC,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Source Layers Selection",
"Which layers to transfer, in case of multi-layers types");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_src[DT_MULTILAYER_INDEX_VCOL]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_uv_select_src",
rna_enum_dt_layers_select_src_items,
DT_LAYERS_ALL_SRC,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Source Layers Selection",
"Which layers to transfer, in case of multi-layers types");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_src[DT_MULTILAYER_INDEX_UV]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_vgroup_select_dst",
rna_enum_dt_layers_select_dst_items,
DT_LAYERS_NAME_DST,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Destination Layers Matching",
"How to match source and destination layers");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_dst[DT_MULTILAYER_INDEX_MDEFORMVERT]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
# if 0
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
prop = RNA_def_enum(srna,
"layers_shapekey_select_dst",
rna_enum_dt_layers_select_dst_items,
DT_LAYERS_NAME_DST,
"Destination Layers Matching",
"How to match source and destination layers");
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_enum_sdna(prop, NULL, "layers_select_dst[DT_MULTILAYER_INDEX_SHAPEKEY]");
ClangFormat: format '#if 0' code Previous cleanups didn't account for space after '#'.
2019-04-17 08:50:46 +02:00
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf");
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
# endif
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_vcol_select_dst",
rna_enum_dt_layers_select_dst_items,
DT_LAYERS_NAME_DST,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Destination Layers Matching",
"How to match source and destination layers");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_dst[DT_MULTILAYER_INDEX_VCOL]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"layers_uv_select_dst",
rna_enum_dt_layers_select_dst_items,
DT_LAYERS_NAME_DST,
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"Destination Layers Matching",
"How to match source and destination layers");
RNA_def_property_enum_sdna(prop, NULL, "layers_select_dst[DT_MULTILAYER_INDEX_UV]");
RNA_def_property_enum_funcs(
prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
/* Mix stuff */
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
prop = RNA_def_enum(srna,
"mix_mode",
rna_enum_dt_mix_mode_items,
CDT_MIX_TRANSFER,
"Mix Mode",
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
"How to affect destination elements with source values");
RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_DataTransferModifier_mix_mode_itemf");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Units: Use units for smoke -Use factor for flame_vorticity, slice_depth, density & volume_density -Use distance for surface_distance -Use factor for mix factor in Data Transfer modifier -Use prop_translation for pivot constraint offset
2019-02-20 21:50:27 +01:00
prop = RNA_def_float_factor(
srna,
"mix_factor",
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 09:38:00 -05:00
0.0f,
Units: Use units for smoke -Use factor for flame_vorticity, slice_depth, density & volume_density -Use distance for surface_distance -Use factor for mix factor in Data Transfer modifier -Use prop_translation for pivot constraint offset
2019-02-20 21:50:27 +01:00
0.0f,
1.0f,
"Mix Factor",
Fix T66040: Make Data Transfer' Mix Factor multiply with vgroup weights when given, instead of ignoring it. Brings behavior of those options in line with the VGroup editing modifiers ones e.g.
2019-08-01 16:00:37 +02:00
"Factor to use when applying data to destination (exact behavior depends on mix mode, "
"multiplied with weights from vertex group when defined)",
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
0.0f,
1.0f);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_string(srna,
"vertex_group",
NULL,
MAX_VGROUP_NAME,
"Vertex Group",
"Vertex group name for selecting the affected areas");
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DataTransferModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
prop = RNA_def_boolean(
srna, "invert_vertex_group", false, "Invert", "Invert vertex group influence");
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_INVERT_VGROUP);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
}
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
static void rna_def_modifier_normaledit(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_mode_items[] = {
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
{MOD_NORMALEDIT_MODE_RADIAL,
"RADIAL",
0,
"Radial",
"From an ellipsoid (shape defined by the boundbox's dimensions, target is optional)"},
{MOD_NORMALEDIT_MODE_DIRECTIONAL,
"DIRECTIONAL",
0,
"Directional",
"Normals 'track' (point to) the target object"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: Use const for RNA EnumPropertyItem args Practically all access to enum data is read-only.
2017-10-18 15:07:26 +11:00
static const EnumPropertyItem prop_mix_mode_items[] = {
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
{MOD_NORMALEDIT_MIX_COPY, "COPY", 0, "Copy", "Copy new normals (overwrite existing)"},
{MOD_NORMALEDIT_MIX_ADD, "ADD", 0, "Add", "Copy sum of new and old normals"},
Fix some UI messages from own recent merge, and RNA code checking for final '.', was a bit too rough.
2015-02-06 09:51:53 +01:00
{MOD_NORMALEDIT_MIX_SUB, "SUB", 0, "Subtract", "Copy new normals minus old normals"},
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
{MOD_NORMALEDIT_MIX_MUL,
"MUL",
0,
"Multiply",
"Copy product of old and new normals (*not* cross product)"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
srna = RNA_def_struct(brna, "NormalEditModifier", "Modifier");
RNA_def_struct_ui_text(
srna, "Normal Edit Modifier", "Modifier affecting/generating custom normals");
RNA_def_struct_sdna(srna, "NormalEditModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_NORMALEDIT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_mode_items);
RNA_def_property_ui_text(prop, "Mode", "How to affect (generate) normals");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_float_array(srna,
"offset",
3,
NULL,
-FLT_MAX,
FLT_MAX,
"Offset",
"Offset from object's center",
-100.0f,
100.0f);
RNA_def_property_subtype(prop, PROP_COORDS);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_property(srna, "mix_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_mix_mode_items);
RNA_def_property_ui_text(prop, "Mix Mode", "How to mix generated normals with existing ones");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
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 09:38:00 -05:00
prop = RNA_def_property(srna, "mix_factor", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_ui_text(
prop, "Mix Factor", "How much of generated normals to mix with exiting ones");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "mix_limit", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_range(prop, 0.0, DEG2RADF(180.0f));
RNA_def_property_ui_text(prop, "Max Angle", "Maximum angle between old and new normals");
EditNormal modifier: add some 'maximum angle' limit. Allows to avoid generating flipped faces when using extreme normal modifications. Related to T48576.
2016-06-06 21:41:17 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Fix T55470: Add option to not fix polygons' winding to Edit Normals modifier. this is actually adding option to add buggy behavior, but.. NPR often expects buggy behaviors, and its one of the main targets for normal editing. So think it's reasonable to add that option (disabled by default of course). Note that am not really happy with UI, but: * Not sure where to put it, it's kind of own self-contained area option. * Don't to make it too much visible, using this should be the exception!
2018-06-14 11:41:12 +02:00
prop = RNA_def_property(srna, "no_polynors_fix", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_NORMALEDIT_NO_POLYNORS_FIX);
RNA_def_property_boolean_default(prop, false);
RNA_def_property_ui_text(prop,
"Lock Polygon Normals",
"Do not flip polygons when their normals are not consistent "
"with their newly computed custom vertex normals");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop, "Vertex Group", "Vertex group name for selecting/weighting the affected areas");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_NormalEditModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Remove use_invert_vertex_group use_ prefix To match other modifiers.
2015-03-30 10:42:40 +11:00
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_NORMALEDIT_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Target", "Target object used to affect normals");
RNA_def_property_pointer_funcs(prop, NULL, "rna_NormalEditModifier_target_set", NULL, NULL);
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
prop = RNA_def_property(srna, "use_direction_parallel", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_NORMALEDIT_USE_DIRECTION_PARALLEL);
RNA_def_property_boolean_default(prop, true);
RNA_def_property_ui_text(prop,
"Parallel Normals",
"Use same direction for all normals, from origin to target's center "
Fix some UI messages from own recent merge, and RNA code checking for final '.', was a bit too rough.
2015-02-06 09:51:53 +01:00
"(Directional mode only)");
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
}
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
static void rna_def_modifier_surfacedeform(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
srna = RNA_def_struct(brna, "SurfaceDeformModifier", "Modifier");
Usual UI/i18n message fixes. Please provide valid description for SurfaceDeform modifier tooltip. Such place-holders should not pass final checks before merging in master!
2017-03-19 17:31:07 +01:00
RNA_def_struct_ui_text(srna, "SurfaceDeform Modifier", "");
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
RNA_def_struct_sdna(srna, "SurfaceDeformModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Target", "Mesh object to deform with");
RNA_def_property_pointer_funcs(
prop, NULL, "rna_SurfaceDeformModifier_target_set", NULL, "rna_Mesh_object_poll");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 2.0f, 16.0f);
RNA_def_property_ui_text(
UI: Fix Capitalization Differential Revision: https://developer.blender.org/D5716
2019-09-20 14:31:24 +02:00
prop, "Interpolation Falloff", "Controls how much nearby polygons influence deformation");
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
prop = RNA_def_property(srna, "is_bound", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_SurfaceDeformModifier_is_bound_get", NULL);
RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to target mesh");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Surface Deform modifier: add vertex group and strength control. This commit aims to add functionality to the surface deform modifier that gives more control and allows it to work better with the modifier stack. * Maintains compatibility with older files. The default settings keep it so that the whole object is bound and vertex coordinates get overwritten as the modifier currently does. * Turns the deformations from an absolute vertex coordinate overwrite into an additive offset from the vertex location before the modifier to the resulting bound deformation. This gives the ability to control the strength of the deformation and mix the deformation of the modifier with the modifier stack that comes before it. * Also adds in a vertex group with the invert option. This is applied after the bind deformation is added. So the whole object is still bound to target, and the vertex group filters afterwards what parts get affected. I experimented with a version to only binds the geometry weighted to the vertex group, but that would break compatibility with old files. I may bring it in later as a separate option/mode for the surface deform. With several fixes from @mont29. Reviewed By: mont29 Differencial Revision: https://developer.blender.org/D6894
2020-03-27 12:20:31 +01:00
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop, "Vertex Group", "Vertex group name for selecting/weighting the affected areas");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SurfaceDeformModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SDEF_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -100, 100);
RNA_def_property_ui_range(prop, -100, 100, 10, 2);
RNA_def_property_ui_text(prop, "Strength", "Strength of modifier deformations");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
}
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
static void rna_def_modifier_weightednormal(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
static EnumPropertyItem prop_weighting_mode_items[] = {
{MOD_WEIGHTEDNORMAL_MODE_FACE,
"FACE_AREA",
0,
"Face Area",
"Generate face area weighted normals"},
{MOD_WEIGHTEDNORMAL_MODE_ANGLE,
"CORNER_ANGLE",
0,
"Corner Angle",
"Generate corner angle weighted normals"},
{MOD_WEIGHTEDNORMAL_MODE_FACE_ANGLE,
"FACE_AREA_WITH_ANGLE",
0,
"Face Area And Angle",
"Generated normals weighted by both face area and angle"},
Cleanup: trailing commas Needed for clan-format not to wrap onto one line.
2019-02-03 14:01:45 +11:00
{0, NULL, 0, NULL, NULL},
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
};
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
srna = RNA_def_struct(brna, "WeightedNormalModifier", "Modifier");
RNA_def_struct_ui_text(srna, "WeightedNormal Modifier", "");
RNA_def_struct_sdna(srna, "WeightedNormalModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_NORMALEDIT);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "weight", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 1, 100);
RNA_def_property_ui_range(prop, 1, 100, 1, -1);
RNA_def_property_ui_text(prop,
"Weight",
"Corrective factor applied to faces' weights, 50 is neutral, "
"lower values increase weight of weak faces, "
"higher values increase weight of strong faces");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_weighting_mode_items);
RNA_def_property_ui_text(prop, "Weighting Mode", "Weighted vertex normal mode to use");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "thresh", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0, 10);
RNA_def_property_ui_range(prop, 0, 10, 1, 2);
RNA_def_property_ui_text(
prop, "Threshold", "Threshold value for different weights to be considered equal");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "keep_sharp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WEIGHTEDNORMAL_KEEP_SHARP);
RNA_def_property_ui_text(prop,
"Keep Sharp",
"Keep sharp edges as computed for default split normals, "
Cleanup: Description should not end with a fullstop
2018-08-13 11:45:55 +02:00
"instead of setting a single weighted normal for each vertex");
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(
prop, "Vertex Group", "Vertex group name for modifying the selected areas");
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightedNormalModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WEIGHTEDNORMAL_INVERT_VGROUP);
RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: use 'use_' prefix for RNA booleans Some of the naming was quite misleading.
2020-09-30 15:01:12 +10:00
prop = RNA_def_property(srna, "use_face_influence", PROP_BOOLEAN, PROP_NONE);
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WEIGHTEDNORMAL_FACE_INFLUENCE);
RNA_def_property_ui_text(prop, "Face Influence", "Use influence of face for weighting");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
}
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
static void rna_def_modifier_nodes_settings(BlenderRNA *brna)
Simulation: Add modifier to access simulation data For now the "Simulation" modifier only exists for point cloud objects, because we need this for the particle system. Right now, the modifier is doing nothing. There is a new `DEG_add_simulation_relation` function that is used by the modifier to make sure that the simulation is evaluated before the modifier is executed. Reviewers: brecht, sergey Differential Revision: https://developer.blender.org/D7549
2020-05-13 12:39:17 +02:00
{
StructRNA *srna;
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
srna = RNA_def_struct(brna, "NodesModifierSettings", NULL);
RNA_def_struct_nested(brna, srna, "NodesModifier");
RNA_def_struct_path_func(srna, "rna_NodesModifierSettings_path");
RNA_def_struct_ui_text(
srna, "Nodes Modifier Settings", "Settings that are passed into the node group");
RNA_def_struct_idprops_func(srna, "rna_NodesModifierSettings_properties");
}
static void rna_def_modifier_nodes(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "NodesModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Nodes Modifier", "");
RNA_def_struct_sdna(srna, "NodesModifierData");
Geometry Nodes: unify icons -> use ICON_NODETREE for everything Until there is a icon made specially for this, the nodetree icon is up for grabs. Using it in the nodegroup + modifier + editor helps the users to make a connection on where to edit those modifiers.
2020-11-18 01:44:46 +01:00
RNA_def_struct_ui_icon(srna, ICON_NODETREE);
Simulation: Add modifier to access simulation data For now the "Simulation" modifier only exists for point cloud objects, because we need this for the particle system. Right now, the modifier is doing nothing. There is a new `DEG_add_simulation_relation` function that is used by the modifier to make sure that the simulation is evaluated before the modifier is executed. Reviewers: brecht, sergey Differential Revision: https://developer.blender.org/D7549
2020-05-13 12:39:17 +02:00
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(true);
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
prop = RNA_def_property(srna, "node_group", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Node Group", "Node group that controls what this modifier does");
RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_NodesModifier_node_group_poll");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_NodesModifier_node_group_update");
prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_ui_text(prop, "Settings", "Settings that are passed into the node group");
LibOverride: Make all modifiers properties overridable. This is second and last part of T77083.
2020-06-04 09:58:46 +02:00
RNA_define_lib_overridable(false);
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
rna_def_modifier_nodes_settings(brna);
Simulation: Add modifier to access simulation data For now the "Simulation" modifier only exists for point cloud objects, because we need this for the particle system. Right now, the modifier is doing nothing. There is a new `DEG_add_simulation_relation` function that is used by the modifier to make sure that the simulation is evaluated before the modifier is executed. Reviewers: brecht, sergey Differential Revision: https://developer.blender.org/D7549
2020-05-13 12:39:17 +02:00
}
Volumes: new Mesh to Volume modifier This modifier can only be added to Volume objects. It takes a mesh as input and generates a "density" grid near the surface or in the enclosed volume. Ref T73201. Reviewers: brecht Differential Revision: https://developer.blender.org/D9032
2020-09-29 16:02:40 +02:00
static void rna_def_modifier_mesh_to_volume(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem resolution_mode_items[] = {
{MESH_TO_VOLUME_RESOLUTION_MODE_VOXEL_AMOUNT,
"VOXEL_AMOUNT",
0,
"Voxel Amount",
"Desired number of voxels along one axis"},
{MESH_TO_VOLUME_RESOLUTION_MODE_VOXEL_SIZE,
"VOXEL_SIZE",
0,
"Voxel Size",
"Desired voxel side length"},
{0, NULL, 0, NULL, NULL},
};
srna = RNA_def_struct(brna, "MeshToVolumeModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Mesh to Volume Modifier", "");
RNA_def_struct_sdna(srna, "MeshToVolumeModifierData");
RNA_def_struct_ui_icon(srna, ICON_VOLUME_DATA); /* TODO: Use correct icon. */
RNA_define_lib_overridable(true);
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Object", "Object");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop = RNA_def_property(srna, "resolution_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, resolution_mode_items);
RNA_def_property_ui_text(
prop, "Resolution Mode", "Mode for how the desired voxel size is specified");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "voxel_size", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(
prop, "Voxel Size", "Smaller values result in a higher resolution output");
Volumes: lower minimal voxel size in Mesh to Volume modifier The 0.1 limit was too large. The issue with making it smaller is that one can easily crash blender by making it to small. To counteract this, the step has been reduced as well. A voxel size/amount of 0 disables the modifier.
2020-10-09 12:55:13 +02:00
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, FLT_MAX, 0.01, 4);
Volumes: new Mesh to Volume modifier This modifier can only be added to Volume objects. It takes a mesh as input and generates a "density" grid near the surface or in the enclosed volume. Ref T73201. Reviewers: brecht Differential Revision: https://developer.blender.org/D9032
2020-09-29 16:02:40 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "voxel_amount", PROP_INT, PROP_NONE);
RNA_def_property_ui_text(prop, "Voxel Amount", "Approximate number of voxels along one axis");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Cleanup: use 'use_' prefix for RNA booleans Some of the naming was quite misleading.
2020-09-30 15:01:12 +10:00
prop = RNA_def_property(srna, "use_fill_volume", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "fill_volume", 1);
Volumes: new Mesh to Volume modifier This modifier can only be added to Volume objects. It takes a mesh as input and generates a "density" grid near the surface or in the enclosed volume. Ref T73201. Reviewers: brecht Differential Revision: https://developer.blender.org/D9032
2020-09-29 16:02:40 +02:00
RNA_def_property_ui_text(
prop, "Fill Volume", "Initialize the density grid in every cell inside the enclosed volume");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "interior_band_width", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(prop, "Interior Band Width", "Width of the volume inside of the mesh");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "exterior_band_width", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(prop, "Exterior Band Width", "Width of the volume outside of the mesh");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "density", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(prop, "Density", "Density of the new volume");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
}
Volumes: new Volume Displace modifier This modifier uses a 3D texture to displace a volume. For now, this can only use the previously existing texture system, because we do not have a better alternative yet. Still, the results can be quite good and interesting. See D9075 for some examples. Reviewers: brecht, simonthommes Differential Revision: https://developer.blender.org/D9075
2020-10-07 18:03:07 +02:00
static void rna_def_modifier_volume_displace(BlenderRNA *brna)
{
static const EnumPropertyItem prop_texture_map_mode_items[] = {
{MOD_VOLUME_DISPLACE_MAP_LOCAL,
"LOCAL",
0,
"Local",
"Use the local coordinate system for the texture coordinates"},
{MOD_VOLUME_DISPLACE_MAP_GLOBAL,
"GLOBAL",
0,
"Global",
"Use the global coordinate system for the texture coordinates"},
{MOD_VOLUME_DISPLACE_MAP_OBJECT,
"OBJECT",
0,
"Object",
"Use the linked object's local coordinate system for the texture coordinates"},
{0, NULL, 0, NULL, NULL},
};
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "VolumeDisplaceModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Volume Displace Modifier", "");
RNA_def_struct_sdna(srna, "VolumeDisplaceModifierData");
RNA_def_struct_ui_icon(srna, ICON_VOLUME_DATA); /* TODO: Use correct icon. */
RNA_define_lib_overridable(true);
prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(prop, "Strength", "Strength of the displacement");
Volumes: reduce step and default of strength in Volume Displace modifier The strength has a high impact on performance. With the previous step and default one could easily and accidentally make Blender unusably slow, because of a too high displacement strength.
2020-10-12 12:37:48 +02:00
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 0.1, 4);
Volumes: new Volume Displace modifier This modifier uses a 3D texture to displace a volume. For now, this can only use the previously existing texture system, because we do not have a better alternative yet. Still, the results can be quite good and interesting. See D9075 for some examples. Reviewers: brecht, simonthommes Differential Revision: https://developer.blender.org/D9075
2020-10-07 18:03:07 +02:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "texture", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Texture", "");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop = RNA_def_property(srna, "texture_map_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_texture_map_mode_items);
RNA_def_property_ui_text(prop, "Texture Mapping Mode", "");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop = RNA_def_property(srna, "texture_map_object", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Object", "Object to use for texture mapping");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop = RNA_def_property(srna, "texture_mid_level", PROP_FLOAT, PROP_XYZ);
RNA_def_property_ui_text(
prop, "Texture Mid Level", "Subtracted from the texture color to get a displacement vector");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1f, 5);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "texture_sample_radius", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_ui_text(
prop,
"Texture Sample Radius",
"Smaller values result in better performance but might cut off the volume");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1f, 5);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
}
Volumes: new Volume to Mesh modifier This modifier is the opposite of the recently added Mesh to Volume modifier. It converts the "surface" of a volume into a mesh. The "surface" is defined by a threshold value. All voxels with a density higher than the threshold are considered to be inside the volume, while all others will be outside. By default, the resolution of the generated mesh depends on the voxel size of the volume grid. The resolution can be customized. It should be noted that a lower resolution might not make this modifier faster. This is because we have to downsample the openvdb grid, which isn't a cheap operation. Converting a mesh to a volume and then back to a mesh is possible, but it does require two separate mesh objects for now. Reviewers: brecht Differential Revision: https://developer.blender.org/D9141
2020-10-19 12:11:38 +02:00
static void rna_def_modifier_volume_to_mesh(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem resolution_mode_items[] = {
{VOLUME_TO_MESH_RESOLUTION_MODE_GRID,
"GRID",
0,
"Grid",
"Use resolution of the volume grid"},
{VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_AMOUNT,
"VOXEL_AMOUNT",
0,
"Voxel Amount",
"Desired number of voxels along one axis"},
{VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_SIZE,
"VOXEL_SIZE",
0,
"Voxel Size",
"Desired voxel side length"},
{0, NULL, 0, NULL, NULL},
};
srna = RNA_def_struct(brna, "VolumeToMeshModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Volume to Mesh Modifier", "");
RNA_def_struct_sdna(srna, "VolumeToMeshModifierData");
RNA_def_struct_ui_icon(srna, ICON_VOLUME_DATA); /* TODO: Use correct icon. */
RNA_define_lib_overridable(true);
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Object", "Object");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(
prop, "Threshold", "Voxels with a larger value are inside the generated mesh");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.001f, 1.0f, 0.1f, 5);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "adaptivity", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(
prop,
"Adaptivity",
"Reduces the final face count by simplifying geometry where detail is not needed");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_smooth_shade", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", VOLUME_TO_MESH_USE_SMOOTH_SHADE);
RNA_def_property_ui_text(
prop, "Smooth Shading", "Output faces with smooth shading rather than flat shaded");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "grid_name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(
prop, "Grid Name", "Grid in the volume object that is converted to a mesh");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "resolution_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, resolution_mode_items);
RNA_def_property_ui_text(
prop, "Resolution Mode", "Mode for how the desired voxel size is specified");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "voxel_size", PROP_FLOAT, PROP_NONE);
RNA_def_property_ui_text(
prop, "Voxel Size", "Smaller values result in a higher resolution output");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, FLT_MAX, 0.01, 4);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "voxel_amount", PROP_INT, PROP_NONE);
RNA_def_property_ui_text(prop, "Voxel Amount", "Approximate number of voxels along one axis");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
}
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
void RNA_def_modifier(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
/* data */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
srna = RNA_def_struct(brna, "Modifier", NULL);
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
RNA_def_struct_ui_text(srna, "Modifier", "Modifier affecting the geometry data of an object");
RNA * Added support for sending notifiers and updates when setting RNA properties. Per property, there is a notifier NC_/ND_ flag, and a function that is called. Currently only used for Object.loc/rot/size. * RNA_property_update that does this is not automatically called in every _set function, it has do be done separate, and is being done by buttons with RNA data. * Perhaps for python there could be a trick to accumulate these flags rather than update each time, though for now the python RNA code could just do them everytime. Did not add these calls in the python code yet because it needs context, not sure where to get that from?
2009-01-01 15:52:51 +00:00
RNA_def_struct_refine_func(srna, "rna_Modifier_refine");
UI: * Added Constraints template and Add Constraint operator. * Added toggle=True/False parameter to uiItemR, to get a toggle button (actual button) rather than an "option" button (checkbox) * Added OPTION/OPTIONN button type, to distinguish with TOG/TOGN. RNA: * Make all modifier pointers editable, including correct updates. * Added notifiers and updates to constraints. * Fix a stack corruption, pointed out by Andrea, and potentially causing crashes.
2009-05-27 00:03:49 +00:00
RNA_def_struct_path_func(srna, "rna_Modifier_path");
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
RNA_def_struct_sdna(srna, "ModifierData");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
/* strings */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Modifier_name_set");
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Name", "Modifier name");
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER | NA_RENAME, NULL);
RNA: review of commits in the past days, check the diffs for the many small changes, but the two bigger ones are: * Sensors and controllers now use inheritance, rather than pointing to the data in a separate struct. Had to add some new RNA define functionality to support this better. * DNA_meta_types.h was marked as done but still missing many things, now completed.
2008-12-02 23:45:11 +00:00
RNA_def_struct_name_property(srna, prop);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
/* enums */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA: * Allow pointers to be editable, did SpaceTextEditor.text as a test. * Changed PROP_NOT_EDITABLE to PROP_EDITABLE, and added RNA_def_property_clear_flag. * Removed rna_dependency.c test code.
2009-03-23 13:24:48 +00:00
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA * Added a function to define booleans negative, to turn negative properties into positive ones gettin rid of the no_ prefix, and also got rid of the use_ prefix for two booleans. * Also made the function for enum bitflags separate, this is quite rare so don't need to bother with this in most cases. * Removed svn:executable flags from some files.
2008-12-03 20:17:12 +00:00
RNA_def_property_enum_sdna(prop, NULL, "type");
Cleanup: use `rna_enum_` prefix for RNA enums Definitions could shadow local vars.
2015-11-23 13:49:52 +11:00
RNA_def_property_enum_items(prop, rna_enum_object_modifier_type_items);
RNA: review of commits in the past days, check the diffs for the many small changes, but the two bigger ones are: * Sensors and controllers now use inheritance, rather than pointing to the data in a separate struct. Had to add some new RNA define functionality to support this better. * DNA_meta_types.h was marked as done but still missing many things, now completed.
2008-12-02 23:45:11 +00:00
RNA_def_property_ui_text(prop, "Type", "");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
/* flags */
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_viewport", PROP_BOOLEAN, PROP_NONE);
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Realtime);
Tooltip improvements for modifier functions
2014-07-14 11:50:01 +02:00
RNA_def_property_ui_text(prop, "Realtime", "Display modifier in viewport");
RNA/Override: Move override-related property flags to own variable. We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05 11:10:05 +02:00
RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
Cleanup: Rename: Static Override -> Library Override. Better to make internal code naming match official/UI naming to some extent, this will reduce confusion in the future. This is 'breaking' scripts and files that would use that feature, but since it is not yet officially supported nor exposed in 2.80, as far as that release is concerned, it is effectively a 'no functional changes' commit.
2019-06-14 23:16:04 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Fix issues with hide/restrict icons after recent changes. Set the names to match the original order again, to avoid breaking addons and various places in the code that relied on them.
2018-11-02 13:05:05 +01:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_ON, 1);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_render", PROP_BOOLEAN, PROP_NONE);
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Render);
Cleanup: Rename: Static Override -> Library Override. Better to make internal code naming match official/UI naming to some extent, this will reduce confusion in the future. This is 'breaking' scripts and files that would use that feature, but since it is not yet officially supported nor exposed in 2.80, as far as that release is concerned, it is effectively a 'no functional changes' commit.
2019-06-14 23:16:04 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
Tooltip improvements for modifier functions
2014-07-14 11:50:01 +02:00
RNA_def_property_ui_text(prop, "Render", "Use modifier during render");
Fix issues with hide/restrict icons after recent changes. Set the names to match the original order again, to avoid breaking addons and various places in the code that relied on them.
2018-11-02 13:05:05 +01:00
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_ON, 1);
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_in_editmode", PROP_BOOLEAN, PROP_NONE);
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Editmode);
Tooltip improvements for modifier functions
2014-07-14 11:50:01 +02:00
RNA_def_property_ui_text(prop, "Edit Mode", "Display modifier in Edit mode");
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_on_cage", PROP_BOOLEAN, PROP_NONE);
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_OnCage);
Fix T41467: Modifier view buttons changing positions. Commits early in this year (to save some space) broke this. Hopefully this time it works in all cases - lastCageIndex is no more influenced by realtime/edit active states. Also, inactivate buttons instead of hiding them, can be useful to set those data even though it does not have any immediate effect. Took the opportunity to switch cage buttons to RNA, btw.
2014-08-17 09:35:57 +02:00
RNA_def_property_ui_text(prop, "On Cage", "Adjust edit cage to modifier result");
RNA_def_property_ui_icon(prop, ICON_MESH_DATA, 0);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
Fix T78902: Only check main modifier panel for expansion property Internally the "show_expanded" property stores the expansion for every subpanel, but for RNA we should only check the first bit of the flag that corresponds to the main panel.
2020-07-13 20:10:49 -04:00
RNA_def_property_boolean_funcs(
prop, "rna_Modifier_show_expanded_get", "rna_Modifier_show_expanded_set");
Fix T62960: Expanding/Closing Constraints/Modifiers causes re-render Mark specific properties as no-dependency-graph tag. This is needed to avoid a centralized Copy-on-Write tag from RNA pointer update.
2019-04-01 10:22:06 +02:00
RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);
UI: Drag and Drop Modifiers, Layout Updates This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
2020-06-05 10:41:03 -04:00
RNA_def_property_boolean_sdna(prop, NULL, "ui_expand_flag", 0);
Cleanup: Rename: Static Override -> Library Override. Better to make internal code naming match official/UI naming to some extent, this will reduce confusion in the future. This is 'breaking' scripts and files that would use that feature, but since it is not yet officially supported nor exposed in 2.80, as far as that release is concerned, it is effectively a 'no functional changes' commit.
2019-06-14 23:16:04 +02:00
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
batch remove .'s used with RNA_def_struct_ui_text
2010-02-10 21:15:44 +00:00
RNA_def_property_ui_text(prop, "Expanded", "Set modifier expanded in the user interface");
Icons: use newly added icons
2018-11-22 15:31:19 +11:00
RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
UI: Set modifier panel expansion on every redraw This will fix situations where the modifier epansion was set elsewhere besides the UI, like from the python console, solving the drawing part of T77502. Also adds update tags to the show_expanded property, which means the properties window redraws when the property changes.
2020-06-09 13:41:50 -04:00
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Geometry Nodes: active modifier + geometry nodes editor This commit adds functions to set and get the object's active modifier, which is stored as a flag in the ModifierData struct, similar to constraints. This will be used to set the context in the node editor. There are no visible changes in this commit. Similar to how the node editor context works for materials, this commit makes the node group displayed in the node editor depend on the active object and its active modifier. To keep the node group from changing, just pin the node group in the header. * Shortcuts performed while there is an active modifier will affect only that modifier (the exception is the A to expand the modifiers). * Clicking anywhere on the empty space in a modifier's panel will make it active. These changes require some refactoring of object modifier code. First is splitting up the modifier property invoke callback, which now needs to be able to get the active modifier separately from the hovered modifier for the different operators. Second is a change to removing modifiers, where there is now a separate function to remove a modifier from an object's list, in order to handle changing the active. Finally, the panel handler needs a small tweak so that this "click in panel" event can be handled afterwards.
2020-12-02 13:35:07 +01:00
prop = RNA_def_property(srna, "is_active", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", eModifierFlag_Active);
RNA_def_property_boolean_funcs(prop, NULL, "rna_Modifier_is_active_set");
RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_ui_text(prop, "Active", "The active modifier in the list");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators.
2012-03-05 23:30:41 +00:00
prop = RNA_def_property(srna, "use_apply_on_spline", PROP_BOOLEAN, PROP_NONE);
Todo item #19816: Wave modifier does not affect Curve Paths Added new option for applyong modifiers on splines' points. This moves tesselation point and path would be affected by modifiers which are applied on splines' points.
2011-01-14 16:57:53 +00:00
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_ApplyOnSpline);
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
RNA_def_property_ui_text(
prop,
UI: Fix Capitalization Differential Revision: https://developer.blender.org/D5716
2019-09-20 14:31:24 +02:00
"Apply on Spline",
Code style edits (mostly spliting long lines, and removing trailing spaces). Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines): * The node types definitions into rna_nodetree_types.h * The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
"Apply this and all preceding deformation modifiers on splines' points rather than "
"on filled curve/surface");
Todo item #19816: Wave modifier does not affect Curve Paths Added new option for applyong modifiers on splines' points. This moves tesselation point and path would be affected by modifiers which are applied on splines' points.
2011-01-14 16:57:53 +00:00
RNA_def_property_ui_icon(prop, ICON_SURFACE_DATA, 0);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
/* types */
rna_def_modifier_subsurf(brna);
rna_def_modifier_lattice(brna);
rna_def_modifier_curve(brna);
rna_def_modifier_build(brna);
rna_def_modifier_mirror(brna);
rna_def_modifier_decimate(brna);
rna_def_modifier_wave(brna);
rna_def_modifier_armature(brna);
rna_def_modifier_hook(brna);
rna_def_modifier_softbody(brna);
rna_def_modifier_boolean(brna);
rna_def_modifier_array(brna);
rna_def_modifier_edgesplit(brna);
rna_def_modifier_displace(brna);
rna_def_modifier_uvproject(brna);
rna_def_modifier_smooth(brna);
Corrective Smooth Modifier (aka delta-mush) This modifier can be used to correct bad deformations, Original patch D1183 by @sazerac, with own modifications
2015-03-29 04:44:05 +11:00
rna_def_modifier_correctivesmooth(brna);
RNA * DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks! Some changes to make it more complete and adding inheritance to better hide irrelevant and reused properties. * Also added all derived types for modifiers, but only fluid is filled in currently. * Some files converted from DOS to UNIX line endings.
2008-12-29 17:36:06 +00:00
rna_def_modifier_cast(brna);
rna_def_modifier_meshdeform(brna);
rna_def_modifier_particlesystem(brna);
rna_def_modifier_particleinstance(brna);
rna_def_modifier_explode(brna);
rna_def_modifier_cloth(brna);
rna_def_modifier_collision(brna);
rna_def_modifier_bevel(brna);
rna_def_modifier_shrinkwrap(brna);
rna_def_modifier_mask(brna);
rna_def_modifier_simpledeform(brna);
warp modifier, added in the render branch for durian. simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
rna_def_modifier_warp(brna);
Added RNA for Multires modifier.
2009-01-06 20:15:23 +00:00
rna_def_modifier_multires(brna);
2.5: Physics Buttons All kinds of changes to get it ready for UI layouts. This means RNA and operators should be working correct, but most buttons are still not actually there yet. * Added near empty soft body, fluid, field and collision panels, tweaks to cloth panels. * Fluid bake works, but without escape or showing any progress. * Fluid/Softbody/Cloth/Collision can now be both added as modifiers or in the physics panels. * Missing: fields & soft body for particles. * Missing: proper updating softbodies, guess this code still needs updates after pointcache refactor?
2009-07-02 19:41:31 +00:00
rna_def_modifier_surface(brna);
Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855
2019-12-16 15:50:14 +01:00
rna_def_modifier_fluid(brna);
Solidify modifier for Durian (allow cloth sim on single layer and make solid after) Mostly the same as the recently added editmode tool with some extras. * Options to disable filling in the rim between inner and outer surface, since its faster not to detect this in cases where its not needed. * Option to disable high quality normal calculation, mostly noticable when operating on building walls, not needed for cloth or more organic shapes. * Option to disable 'even thickness', again, not needed in some cases. Also options for creasing inner/outer and rim edges, need this for makign Sintels cloths solid since zero crease looks far too soft. note: * UVs and VCols etc are copied to the new skin however rim faces dont get the UVs or vcols set from the faces they are created from yet. * Normals are assumed to be pointing outwards * used patch from Uncle Entity as a template since it added the DNA and RNA entries but the actual modifier from the patch wasnt used.
2009-12-21 01:02:08 +00:00
rna_def_modifier_solidify(brna);
Screw Modifier (old patch was called Lathe) didnt commit this patch because curves are generally better to create a shape to lathe however now that curves can have modifiers applied to them I think its good to have this. Added options to offset the lathe so it can work like the screw tool as well. - optional object for axis which also controls the center point. - screw offset so rather then just lathing this can work more like the screw tool. - screw optionally using the object distance along the axis. - iterations so the screw can be applied multiple times. tested to work well with curves.
2010-03-22 00:22:52 +00:00
rna_def_modifier_screw(brna);
UV Warp Modifier: Based on patch [#30837] UV Offset Modifier by Pawel Kowal (pkowal) - Allows you to setup a transformation between objects to apply to UV coords. - Option to select which axis apply to U/V. - Option to select the UV center (needed for transformations that scale or rotate). - Uses from/to objects in a similar way to the Warp modifier. - Vertex group can be used to adjust influence.
2012-12-14 04:07:30 +00:00
rna_def_modifier_uvwarp(brna);
Adding WeightVG modifiers code. Still some points to tweak, though. NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
rna_def_modifier_weightvgedit(brna);
rna_def_modifier_weightvgmix(brna);
rna_def_modifier_weightvgproximity(brna);
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
rna_def_modifier_dynamic_paint(brna);
Ocean Sim modifier patch by Matt Ebb, Hamed Zaghaghi This adds a new Modifier "Ocean" to simulate large-scale wave motion. Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3] The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled. [1] http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean [2] http://www.savetheoceansim.com [3] http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
rna_def_modifier_ocean(brna);
Add remesh modifier (dual contouring). This patch adds a new remeshing modifier. The algorithm is based on the paper "Dual Contouring of Hermite Data", and the implementation was contributed to Blender by Dr. Tao Ju. The contributed code is in intern/dualcon, and was modified to compile under gcc and work on 64-bit systems. Files not needed for Blender were removed and a small C wrapper was added in order to interface it with Blender. The rest of the patch is just standard modifier stuff. Reviewed by Sergey, code review link: http://codereview.appspot.com/5491053/ The remesh icon was contributed by Zafio: http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2. Thanks to everyone in that thread for the icon proposals and discussion. Documentation and examples on the Blender wiki: http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier In case the history is needed for anything, check the remesh-modifier branch of this git repository: https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
rna_def_modifier_remesh(brna);
Add skin modifier: DNA, RNA, UI, and MOD_skin.c implementation. Skin modifier documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier Implementation based in part off the paper "B-Mesh: A Fast Modeling System for Base Meshes of 3D Articulated Shapes" (Zhongping Ji, Ligang Liu, Yigang Wang) Note that to avoid confusion with Blender's BMesh data structure, this tool is renamed as the Skin modifier. The B-Mesh paper is current available here: http://www.math.zju.edu.cn/ligangliu/CAGD/Projects/BMesh/ The main missing features in this code compared to the paper are: * No mesh evolution. The paper suggests iteratively subsurfing the skin output and adapting the output to better conform with the spheres of influence surrounding each vertex. * No mesh fairing. The paper suggests re-aligning output edges to follow principal mesh curvatures. * No auxiliary balls. These would serve to influence mesh evolution, which as noted above is not implemented. The code also adds some features not present in the paper: * Loops in the input edge graph. * Concave surfaces around branch nodes. The paper does not discuss how to handle non-convex regions; this code adds a number of cleanup operations to handle many (though not all) of these cases.
2012-05-22 15:29:01 +00:00
rna_def_modifier_skin(brna);
Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) by Alexander Pinzon Fernandez (apinzonf) Supported by Google Summer of Code 2012 Project Documentation: http://wiki.blender.org/index.php/User:Apinzonf Manual Page: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
2012-10-24 10:39:11 +00:00
rna_def_modifier_laplaciansmooth(brna);
Triangulate modifier Useful for bump map baking where a consistent triangulation should be enforced when baking/exporting/importing, to avoid artifacts caused by a different triangulation of the mesh by that which was used for baking by internal/external tools. documentation is here http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/More_Features Will probably add some pictures too to demonstrate the issue that is solved more clearly. Currently using the skin modifier icon, will soon change that. Review by Brecht, thanks!
2012-11-19 20:40:08 +00:00
rna_def_modifier_triangulate(brna);
mesh-cache deform modifier, supports MDD and PC2 formats. see wiki docs: http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Deform/Mesh_Cache
2013-01-21 15:41:00 +00:00
rna_def_modifier_meshcache(brna);
Mesh Modifiers: Added Laplacian Deform Part of soc-2013-sketch_mesh branch See: http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Deform
2013-11-24 07:00:49 +11:00
rna_def_modifier_laplaciandeform(brna);
Modifier: New Weld Modifier Part of T70240 This is the initial implementation of Weld Modifier. New features will be added later. ToDo: - Seams: restrict welding to vertices along boundary edges. - Edge Collapse: collapse edges below the length threshold. - New icon. - Some customdata are not being correctly interpolated. Differential Revision: https://developer.blender.org/D6383
2019-12-11 22:31:20 -03:00
rna_def_modifier_weld(brna);
Cleanup: Organize Weld Modifier in alphabetical order
2020-03-31 20:39:37 -03:00
rna_def_modifier_wireframe(brna);
Transfer data: add modifier. Not much to add, modifier uses same code as operator basically, only key difference is that modifier will never create data layers itself, you have to use dedicated operator for that.
2015-01-09 21:19:12 +01:00
rna_def_modifier_datatransfer(brna);
Custom Loop Normals: Add NormalEdit modifier Nothing much to say here, basic tool to make normals point toward a target, or to make them point 'outward' as if object was a spheroid (useful for game bushes etc.). Also, forgot a big thank you to Campbell for the extensive review work he has done on this project!
2015-02-05 14:49:44 +01:00
rna_def_modifier_normaledit(brna);
Basic Alembic support All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-06 06:20:37 +02:00
rna_def_modifier_meshseqcache(brna);
Surface Deform Modifier (SDef) Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-27 12:39:14 -03:00
rna_def_modifier_surfacedeform(brna);
Applied soc-2017-normal-tools
2018-05-25 22:24:24 +05:30
rna_def_modifier_weightednormal(brna);
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
rna_def_modifier_nodes(brna);
Volumes: new Mesh to Volume modifier This modifier can only be added to Volume objects. It takes a mesh as input and generates a "density" grid near the surface or in the enclosed volume. Ref T73201. Reviewers: brecht Differential Revision: https://developer.blender.org/D9032
2020-09-29 16:02:40 +02:00
rna_def_modifier_mesh_to_volume(brna);
Volumes: new Volume Displace modifier This modifier uses a 3D texture to displace a volume. For now, this can only use the previously existing texture system, because we do not have a better alternative yet. Still, the results can be quite good and interesting. See D9075 for some examples. Reviewers: brecht, simonthommes Differential Revision: https://developer.blender.org/D9075
2020-10-07 18:03:07 +02:00
rna_def_modifier_volume_displace(brna);
Volumes: new Volume to Mesh modifier This modifier is the opposite of the recently added Mesh to Volume modifier. It converts the "surface" of a volume into a mesh. The "surface" is defined by a threshold value. All voxels with a density higher than the threshold are considered to be inside the volume, while all others will be outside. By default, the resolution of the generated mesh depends on the voxel size of the volume grid. The resolution can be customized. It should be noted that a lower resolution might not make this modifier faster. This is because we have to downsample the openvdb grid, which isn't a cheap operation. Converting a mesh to a volume and then back to a mesh is possible, but it does require two separate mesh objects for now. Reviewers: brecht Differential Revision: https://developer.blender.org/D9141
2020-10-19 12:11:38 +02:00
rna_def_modifier_volume_to_mesh(brna);
RNA: Implemented RNA wrapper for ModifierData. Note that actual interface to access data of any specific modifier is still missing. I also marked a couple of parts as TODO that should be reviewed to decide whether or not to expose those specific parts via RNA.
2008-12-01 13:01:48 +00:00
}
#endif
Copy Permalink