diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
| commit | 189c2e9277d4abd3b750a5a60ef42549dcfe359d (patch) | |
| tree | 1430a845f4aab56b9133c3d8c6ffac09ee6dd92a /source/blender/bmesh/intern/bmesh_marking.c | |
| parent | 771bad9c6abaad4b742935e5d55067f281287650 (diff) | |
| parent | 1519b6a23e0341e25bf5a5c714f9f3d119ab8781 (diff) | |
Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_context
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_marking.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 19e6f646564..ee35d8cd1d2 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -537,7 +537,7 @@ void BM_mesh_select_mode_set(BMesh *bm, int selectmode) * counts number of elements with flag enabled/disabled */ static int bm_mesh_flag_count(BMesh *bm, const char htype, const char hflag, - const short respecthide, const bool test_for_enabled) + const bool respecthide, const bool test_for_enabled) { BMElem *ele; BMIter iter; |