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/modifiers/intern | |
parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/modifiers/intern')
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.h b/source/blender/modifiers/intern/MOD_boolean_util.h index dcd5460c7c3..8e3617cf74e 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.h +++ b/source/blender/modifiers/intern/MOD_boolean_util.h @@ -30,8 +30,8 @@ */ -#ifndef MOD_BOOLEAN_UTILS_H -#define MOD_BOOLEAN_UTILS_H +#ifndef __MOD_BOOLEAN_UTIL_H__ +#define __MOD_BOOLEAN_UTIL_H__ struct Scene; struct Object; diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 2c22f37bcbe..334826e618b 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -30,8 +30,8 @@ */ -#ifndef MOD_FLUIDSIM_UTIL_H -#define MOD_FLUIDSIM_UTIL_H +#ifndef __MOD_FLUIDSIM_UTIL_H__ +#define __MOD_FLUIDSIM_UTIL_H__ struct Object; struct Scene; diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index f1f6252c255..623fe996668 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -25,8 +25,8 @@ */ -#ifndef MOD_UTIL_H -#define MOD_UTIL_H +#ifndef __MOD_UTIL_H__ +#define __MOD_UTIL_H__ /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -48,4 +48,4 @@ struct DerivedMesh *get_cddm(struct Object *ob, struct BMEditMesh *em, struct De struct DerivedMesh *get_dm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int orco); void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm, const char *name, struct MDeformVert **dvert, int *defgrp_index); -#endif /* MOD_UTIL_H */ +#endif /* __MOD_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 5ae1e991073..5572628fd3f 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -29,8 +29,8 @@ */ -#ifndef MOD_WEIGHTVG_UTIL_H -#define MOD_WEIGHTVG_UTIL_H +#ifndef __MOD_WEIGHTVG_UTIL_H__ +#define __MOD_WEIGHTVG_UTIL_H__ /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -85,4 +85,4 @@ void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, const int *indices, const float *weights, int do_add, float add_thresh, int do_rem, float rem_thresh); -#endif /* MOD_WEIGHTVG_UTIL_H */ +#endif /* __MOD_WEIGHTVG_UTIL_H__ */ |