diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 11:32:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 11:32:55 +0300 |
commit | ea6fef938500f9405e7d6ff39297164b95d2811a (patch) | |
tree | faf3c00af15ab9a0fc4d9dd13a2cd3cb1b219ef2 /source | |
parent | 16a8f35df1aa410134f273f7693c33f8ac8d337b (diff) | |
parent | b26e9f00007b048cec3b3c7a93420d92ec0877c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/bmesh/bmesh.h | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_query.c (renamed from source/blender/bmesh/intern/bmesh_queries.c) | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_query.h (renamed from source/blender/bmesh/intern/bmesh_queries.h) | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_query_inline.h (renamed from source/blender/bmesh/intern/bmesh_queries_inline.h) | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 320bebc9958..bd3eb4cc1ac 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -119,9 +119,9 @@ set(SRC intern/bmesh_polygon_edgenet.c intern/bmesh_polygon_edgenet.h intern/bmesh_private.h - intern/bmesh_queries.c - intern/bmesh_queries.h - intern/bmesh_queries_inline.h + intern/bmesh_query.c + intern/bmesh_query.h + intern/bmesh_query_inline.h intern/bmesh_structure.c intern/bmesh_structure.h intern/bmesh_structure_inline.h diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 779259c68f3..138b8b7c51f 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -98,7 +98,7 @@ * * These are accessible through the iterator api, which is covered later in this document * - * See source/blender/bmesh/bmesh_queries.h for more misc. queries. + * See source/blender/bmesh/bmesh_query.h for more misc. queries. * * * \section bm_api The BMesh API @@ -246,7 +246,7 @@ extern "C" { #include "intern/bmesh_operators.h" #include "intern/bmesh_polygon.h" #include "intern/bmesh_polygon_edgenet.h" -#include "intern/bmesh_queries.h" +#include "intern/bmesh_query.h" #include "intern/bmesh_walkers.h" #include "intern/bmesh_inline.h" diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_query.c index 5ce4b236d03..33ad7836893 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/bmesh/intern/bmesh_queries.c +/** \file blender/bmesh/intern/bmesh_query.c * \ingroup bmesh * * This file contains functions for answering common diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_query.h index e602c63da94..cb3af88c316 100644 --- a/source/blender/bmesh/intern/bmesh_queries.h +++ b/source/blender/bmesh/intern/bmesh_query.h @@ -23,7 +23,7 @@ #ifndef __BMESH_QUERIES_H__ #define __BMESH_QUERIES_H__ -/** \file blender/bmesh/intern/bmesh_queries.h +/** \file blender/bmesh/intern/bmesh_query.h * \ingroup bmesh */ @@ -196,6 +196,6 @@ int BM_mesh_calc_edge_groups( /* not really any good place to put this */ float bmesh_subd_falloff_calc(const int falloff, float val) ATTR_WARN_UNUSED_RESULT; -#include "bmesh_queries_inline.h" +#include "bmesh_query_inline.h" #endif /* __BMESH_QUERIES_H__ */ diff --git a/source/blender/bmesh/intern/bmesh_queries_inline.h b/source/blender/bmesh/intern/bmesh_query_inline.h index 09cf39b526d..1bd77d23ded 100644 --- a/source/blender/bmesh/intern/bmesh_queries_inline.h +++ b/source/blender/bmesh/intern/bmesh_query_inline.h @@ -18,7 +18,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/bmesh/intern/bmesh_queries_inline.h +/** \file blender/bmesh/intern/bmesh_query_inline.h * \ingroup bmesh */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c6a6db17a6e..f233780a85b 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -8816,7 +8816,7 @@ static void applyTimeScale(TransInfo *t, const int UNUSED(mval[2])) /** \} */ -/* TODO, move to: transform_queries.c */ +/* TODO, move to: transform_query.c */ bool checkUseAxisMatrix(TransInfo *t) { /* currently only checks for editmode */ diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index df2fa1da43d..744170d9aba 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -886,7 +886,7 @@ void freeVertSlideVerts(TransInfo *t, TransDataContainer *tc, TransCustomData *c void projectVertSlideData(TransInfo *t, bool is_final); -/* TODO. transform_queries.c */ +/* TODO. transform_query.c */ bool checkUseAxisMatrix(TransInfo *t); #define TRANSFORM_SNAP_MAX_PX 100.0f |