diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 11:50:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 11:50:59 +0300 |
| commit | d7ddffdcce6db03e63c09c566b57a1252101058f (patch) | |
| tree | ae967c1bafeaf6abbe76012772d49ea488076fe6 /source/blender/makesdna/DNA_object_types.h | |
| parent | a5180abde0b5b958b331c026d4cd1628b6d2c747 (diff) | |
| parent | 59740a6c985efbf5369d27a5919e184036d0287a (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/editors/include/ED_transform.h
source/blender/editors/space_view3d/view3d_intern.h
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 26cc264b3df..0cbf1f8ffa3 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; |