diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-14 13:25:17 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-14 13:25:17 +0300 |
| commit | 12dd009356321aefb08e51bad58d181374a32cf7 (patch) | |
| tree | 30f0644fb6cb7995ef2fe3bd99883a47be27bbef /source/blender/makesdna/DNA_object_types.h | |
| parent | c4e0d09e2dbb795028436cf42a33890a73542110 (diff) | |
| parent | ed40d5eaa79972486f743de04e11fb64f4af0049 (diff) | |
Merge branch 'master' into alembic
Conflicts:
source/blender/blenkernel/intern/object_dupli.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 24a45f86b05..0746fc9d76e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -433,7 +433,7 @@ enum { OB_DUPLIVERTS = 1 << 4, OB_DUPLIROT = 1 << 5, OB_DUPLINOSPEED = 1 << 6, -/* OB_POWERTRACK = 1 << 7,*/ /*UNUSED*/ + OB_DUPLICALCDERIVED = 1 << 7, /* runtime, calculate derivedmesh for dupli before it's used */ OB_DUPLIGROUP = 1 << 8, OB_DUPLIFACES = 1 << 9, OB_DUPLIFACES_SCALE = 1 << 10, |