Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 08:32:55 +0000 (10:32 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 08:32:55 +0000 (10:32 +0200)
1  2 
source/blender/bmesh/bmesh.h
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h

Simple merge
index df2fa1da43dcfc0c7d5082a4c81f877e173866e0,017bbfc8a5e966639c72a55cb9f7538c7212013f..744170d9aba8a4972cd935cf9ea1a5970ef8fac4
@@@ -886,9 -809,10 +886,9 @@@ void freeVertSlideVerts(TransInfo *t, T
  void projectVertSlideData(TransInfo *t, bool is_final);
  
  
- /* TODO. transform_queries.c */
+ /* TODO. transform_query.c */
  bool checkUseAxisMatrix(TransInfo *t);
  
 -#define TRANSFORM_DIST_MAX_PX 1000.0f
  #define TRANSFORM_SNAP_MAX_PX 100.0f
  #define TRANSFORM_DIST_INVALID -FLT_MAX