diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
| commit | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (patch) | |
| tree | 8cf8bf458d14a26849dbee6af312ff9361029b90 /source/blender/makesdna/DNA_meshdata_types.h | |
| parent | e9eed190e83eb351aeb435d21287eaf37fcffeb0 (diff) | |
| parent | e09ab8883ce0e41add94058ecd4045ac5efa74c6 (diff) | |
Merged changes in the trunk up to revision 44797.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index d7be7c0bff6..b4c0fa09047 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -75,8 +75,8 @@ typedef struct MCol { char a, r, g, b; } MCol; -/*new face structure, replaces MFace, which is now - only used for storing tessellations.*/ +/* new face structure, replaces MFace, which is now + * only used for storing tessellations.*/ typedef struct MPoly { /* offset into loop array and number of loops in the face */ int loopstart; @@ -85,8 +85,8 @@ typedef struct MPoly { char flag, pad; } MPoly; -/*the e here is because we want to move away from - relying on edge hashes.*/ +/* the e here is because we want to move away from + * relying on edge hashes.*/ typedef struct MLoop { unsigned int v; /*vertex index*/ unsigned int e; /*edge index*/ |