diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
| commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
| tree | ca98c07367717703c5a8801063cc42e0aff5b855 /source/blender/editors/object | |
| parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
| parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) | |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index f8b6d89d397..526706b566d 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -28,8 +28,8 @@ * \ingroup edobj */ -#ifndef ED_OBJECT_INTERN_H -#define ED_OBJECT_INTERN_H +#ifndef __OBJECT_INTERN_H__ +#define __OBJECT_INTERN_H__ struct wmOperatorType; struct KeyBlock; @@ -226,5 +226,5 @@ void OBJECT_OT_group_remove(struct wmOperatorType *ot); /* object_bake.c */ void OBJECT_OT_bake_image(wmOperatorType *ot); -#endif /* ED_OBJECT_INTERN_H */ +#endif /* __OBJECT_INTERN_H__ */ |