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:
authorCampbell Barton <ideasman42@gmail.com>2013-06-03 09:07:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-06-03 09:07:16 +0400
commit790e9d9fa084c30609a13d175c56a4f3c14f132e (patch)
treee56e66a7b0e5d1eef4153be76b1d2cc0b97c9fa6 /source/blender/makesdna
parent8a1ef33e88d2683f8566f4db8edbc3dc2f488307 (diff)
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.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 66685c131d4..4fa8ed2b34a 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -367,7 +367,8 @@ typedef struct DecimateModifierData {
float percent; /* (mode == MOD_DECIM_MODE_COLLAPSE) */
short iter; /* (mode == MOD_DECIM_MODE_UNSUBDIV) */
- short pad;
+ char delimit; /* (mode == MOD_DECIM_MODE_DISSOLVE) */
+ char pad;
float angle; /* (mode == MOD_DECIM_MODE_DISSOLVE) */
char defgrp_name[64]; /* MAX_VGROUP_NAME */