diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/bmesh/tools/bmesh_path.h | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_path.h')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_path.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/bmesh/tools/bmesh_path.h b/source/blender/bmesh/tools/bmesh_path.h index a13290b875e..c39e08e83ef 100644 --- a/source/blender/bmesh/tools/bmesh_path.h +++ b/source/blender/bmesh/tools/bmesh_path.h @@ -29,14 +29,17 @@ struct LinkNode *BM_mesh_calc_path_vert( BMesh *bm, BMVert *v_src, BMVert *v_dst, const bool use_length, - void *user_data, bool (*filter_fn)(BMVert *, void *)); + bool (*filter_fn)(BMVert *, void *), void *user_data) +ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); struct LinkNode *BM_mesh_calc_path_edge( BMesh *bm, BMEdge *e_src, BMEdge *e_dst, const bool use_length, - void *user_data, bool (*filter_fn)(BMEdge *, void *)); + bool (*filter_fn)(BMEdge *, void *), void *user_data) +ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); struct LinkNode *BM_mesh_calc_path_face( BMesh *bm, BMFace *f_src, BMFace *f_dst, const bool use_length, - void *user_data, bool (*test_fn)(BMFace *, void *)); + bool (*test_fn)(BMFace *, void *), void *user_data) +ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5); #endif /* __BMESH_PATH_H__ */ |