diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 17:41:00 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:18:11 +0300 |
commit | d140e70c496122915eb5c05aba83153e2e0d7998 (patch) | |
tree | 1e589247d69da64aa7b0e7802319237ec050b5d6 /source/blender/python/bmesh/bmesh_py_types.c | |
parent | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (diff) | |
parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) |
Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments
Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.
Conflicts:
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c
source/blender/bmesh/tools/bmesh_region_match.c
tests/gtests/blenlib/BLI_ghash_performance_test.cc
tests/gtests/blenlib/BLI_ghash_test.cc
tests/gtests/blenlib/CMakeLists.txt
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types.c')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 20ee872b3be..f63381d7a7d 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -79,6 +79,8 @@ PyC_FlagSet bpy_bm_htype_all_flags[] = { {0, NULL} }; +#define BPY_BM_HFLAG_ALL_STR "('SELECT', 'HIDE', 'SEAM', 'SMOOTH', 'TAG')" + PyC_FlagSet bpy_bm_hflag_all_flags[] = { {BM_ELEM_SELECT, "SELECT"}, {BM_ELEM_HIDDEN, "HIDE"}, @@ -1128,7 +1130,7 @@ PyDoc_STRVAR(bpy_bmesh_transform_doc, "\n" " :arg matrix: transform matrix.\n" " :type matrix: 4x4 :class:`mathutils.Matrix`\n" -" :arg filter: set of values in ('SELECT', 'HIDE', 'SEAM', 'SMOOTH', 'TAG').\n" +" :arg filter: set of values in " BPY_BM_HFLAG_ALL_STR ".\n" " :type filter: set\n" ); static PyObject *bpy_bmesh_transform(BPy_BMElem *self, PyObject *args, PyObject *kw) @@ -3251,17 +3253,17 @@ static PyObject *bpy_bmloop_repr(BPy_BMLoop *self) /* Types * ===== */ -PyTypeObject BPy_BMesh_Type = {{{0}}}; -PyTypeObject BPy_BMVert_Type = {{{0}}}; -PyTypeObject BPy_BMEdge_Type = {{{0}}}; -PyTypeObject BPy_BMFace_Type = {{{0}}}; -PyTypeObject BPy_BMLoop_Type = {{{0}}}; -PyTypeObject BPy_BMElemSeq_Type = {{{0}}}; -PyTypeObject BPy_BMVertSeq_Type = {{{0}}}; -PyTypeObject BPy_BMEdgeSeq_Type = {{{0}}}; -PyTypeObject BPy_BMFaceSeq_Type = {{{0}}}; -PyTypeObject BPy_BMLoopSeq_Type = {{{0}}}; -PyTypeObject BPy_BMIter_Type = {{{0}}}; +PyTypeObject BPy_BMesh_Type; +PyTypeObject BPy_BMVert_Type; +PyTypeObject BPy_BMEdge_Type; +PyTypeObject BPy_BMFace_Type; +PyTypeObject BPy_BMLoop_Type; +PyTypeObject BPy_BMElemSeq_Type; +PyTypeObject BPy_BMVertSeq_Type; +PyTypeObject BPy_BMEdgeSeq_Type; +PyTypeObject BPy_BMFaceSeq_Type; +PyTypeObject BPy_BMLoopSeq_Type; +PyTypeObject BPy_BMIter_Type; @@ -3757,10 +3759,11 @@ void bpy_bm_generic_invalidate(BPy_BMGeneric *self) * * The 'bm_r' value is assigned when empty, and used when set. */ -void *BPy_BMElem_PySeq_As_Array(BMesh **r_bm, PyObject *seq, Py_ssize_t min, Py_ssize_t max, Py_ssize_t *r_size, - const char htype, - const bool do_unique_check, const bool do_bm_check, - const char *error_prefix) +void *BPy_BMElem_PySeq_As_Array( + BMesh **r_bm, PyObject *seq, Py_ssize_t min, Py_ssize_t max, Py_ssize_t *r_size, + const char htype, + const bool do_unique_check, const bool do_bm_check, + const char *error_prefix) { BMesh *bm = (r_bm && *r_bm) ? *r_bm : NULL; PyObject *seq_fast; |