diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
commit | a5152b7ca0d6d7f340b1955c0e8a15ba23fda336 (patch) | |
tree | 1b8289047b989964a442deb8f084a04d07f97b00 /source/blender/makesdna/DNA_meshdata_types.h | |
parent | 8925ed1420ea2557abc7867cf12f89730ef77718 (diff) | |
parent | 65228807725d57aa4d33bcb8c3e3966d1acf0b8a (diff) |
Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index b0a1d23f166..70e9cf04b18 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -189,9 +189,9 @@ typedef struct MDisps { float (*disps)[3]; /* Used for hiding parts of a multires mesh. Essentially the multires - equivalent of MVert.flag's ME_HIDE bit. - - This is a bitmap, keep in sync with type used in BLI_bitmap.h */ + * equivalent of MVert.flag's ME_HIDE bit. + * + * This is a bitmap, keep in sync with type used in BLI_bitmap.h */ unsigned int *hidden; } MDisps; |