[Bf-blender-cvs] [ea6fef93850] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sat Jun 30 10:34:07 CEST 2018


Commit: ea6fef938500f9405e7d6ff39297164b95d2811a
Author: Campbell Barton
Date:   Sat Jun 30 10:32:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBea6fef938500f9405e7d6ff39297164b95d2811a

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/transform/transform.h
index df2fa1da43d,017bbfc8a5e..744170d9aba
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@@ -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



More information about the Bf-blender-cvs mailing list