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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-11-14 03:36:47 +0300
committerDalai Felinto <dalai@blender.org>2020-11-14 03:51:06 +0300
commite50553c61a2d0331b650d2d3d54ef9cb479eebd5 (patch)
treefacd5f7e99e2d4eac32bb51943cce65152d77094 /source/blender/makesrna
parentb458ea6b23381a9acb90dbbd73ced678e1d404c5 (diff)
Empty Modifier: Fix build and put in the right order
Bypassing the macro that creates modifiers to allow the enum to be referring to the Empty modifier, but the internal struct in the code to be Nodes. Also fix the name of the new created modifiers to be "Empty". Fix was built with rBb458ea6b23381a9acb90dbbd73ced678e1d404c5.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 5b3bd61a1a4..5b21fdb9cec 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -143,6 +143,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
ICON_MOD_EDGESPLIT,
"Edge Split",
"Split away joined faces at the edges"},
+ {eModifierType_Empty, "EMPTY", ICON_MESH_DATA, "Empty", ""}, /* TODO: Use correct icon. */
{eModifierType_Mask,
"MASK",
ICON_MOD_MASK,
@@ -163,7 +164,6 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
ICON_MOD_MULTIRES,
"Multiresolution",
"Subdivide the mesh in a way that allows editing the higher subdivision levels"},
- {eModifierType_Empty, "EMPTY", ICON_MESH_DATA, "Empty", ""}, /* TODO: Use correct icon. */
{eModifierType_Remesh,
"REMESH",
ICON_MOD_REMESH,