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/blender/editors | |
parent | 16a8f35df1aa410134f273f7693c33f8ac8d337b (diff) | |
parent | b26e9f00007b048cec3b3c7a93420d92ec0877c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 |