diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-31 17:59:19 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-31 17:59:19 +0300 |
| commit | 3c6c33be988e3ef167a69a980a8ce14b0ca44291 (patch) | |
| tree | 4f690aaa8fed7ca6f1446a63ca573f49be21bf56 /source/blender/makesdna/DNA_object_types.h | |
| parent | 54c2e625e589893f0e1ec1d980078c42e437da39 (diff) | |
| parent | 79918e05773132ce1f96c90b555348229ddfcf73 (diff) | |
Merge branch 'master' into alembic
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 2bf76c7d40a..7b91711462c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -48,7 +48,6 @@ struct Ipo; struct BoundBox; struct Path; struct Material; -struct bConstraintChannel; struct PartDeflect; struct SoftBody; struct FluidsimSettings; |