diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
| commit | 75b393612809252349bf4062bc45df14c1a5dfe5 (patch) | |
| tree | 12650c13c6e927a9e084491aca3d09b77f4f4974 /source/blender/editors/include/ED_object.h | |
| parent | ceb9b237f224a480ef13ca151af07aa2d1e1ea60 (diff) | |
| parent | fbf3a76f1d4b50b81334f55efbff7a1e6ba1f413 (diff) | |
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 2cda5e070d3..5a2a4765c74 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -139,8 +139,8 @@ void ED_setflagsLatt(struct Object *obedit, int flag); /* object_modifier.c */ enum { MODIFIER_APPLY_DATA=1, - MODIFIER_APPLY_SHAPE, -} eModifier_Apply_Mode; + MODIFIER_APPLY_SHAPE +}; struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type); int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct ModifierData *md); |