diff options
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh_mapping.h | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h index 327c13c7ce4..0518f303744 100644 --- a/source/blender/blenkernel/BKE_mesh_mapping.h +++ b/source/blender/blenkernel/BKE_mesh_mapping.h @@ -249,7 +249,10 @@ int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge, ((CHECK_TYPE_ANY( \ _tri, unsigned int *, int *, int[3], const unsigned int *, const int *, const int[3]), \ CHECK_TYPE_ANY(_v, unsigned int, const unsigned int, int, const int)), \ - (((_tri)[0] == _v) ? 0 : ((_tri)[1] == _v) ? 1 : ((_tri)[2] == _v) ? 2 : -1)) + (((_tri)[0] == _v) ? 0 : \ + ((_tri)[1] == _v) ? 1 : \ + ((_tri)[2] == _v) ? 2 : \ + -1)) #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index ffc060bb64e..fae75762cde 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -148,8 +148,11 @@ KeyingSet *BKE_keyingset_add( /* allocate new KeyingSet */ ks = MEM_callocN(sizeof(KeyingSet), "KeyingSet"); - BLI_strncpy( - ks->idname, (idname) ? idname : (name) ? name : DATA_("KeyingSet"), sizeof(ks->idname)); + BLI_strncpy(ks->idname, + (idname) ? idname : + (name) ? name : + DATA_("KeyingSet"), + sizeof(ks->idname)); BLI_strncpy(ks->name, (name) ? name : (idname) ? idname : DATA_("Keying Set"), sizeof(ks->name)); ks->flag = flag; |