projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into blender2.8
[blender.git]
/
source
/
blender
/
makesdna
/
DNA_modifier_types.h
diff --git
a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 1818aee550924f76cb068f99f5776fdc98974334..5d04fba776fa92a29fa4756b87e9d77ee6bafabd 100644
(file)
--- a/
source/blender/makesdna/DNA_modifier_types.h
+++ b/
source/blender/makesdna/DNA_modifier_types.h
@@
-1480,7
+1480,9
@@
typedef struct NormalEditModifierData {
short mix_mode;
char pad[2];
float mix_factor;
+ float mix_limit;
float offset[3];
+ float pad_f1;
} NormalEditModifierData;
/* NormalEditModifierData.mode */