From 2b69665c147f226e820c3c7bba7cebe35ee1dc1b Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sun, 28 Sep 2014 16:48:22 +1300 Subject: Transform: Provide descriptive error messages when wrong transform modes are used in DopeSheet --- source/blender/editors/transform/transform.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 008022a9859..31ef76f0bb9 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -58,6 +58,7 @@ #include "BKE_particle.h" #include "BKE_unit.h" #include "BKE_mask.h" +#include "BKE_report.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -4066,6 +4067,9 @@ static void initTranslation(TransInfo *t) { if (t->spacetype == SPACE_ACTION) { /* this space uses time translate */ + BKE_report(t->reports, RPT_ERROR, + "Use 'Time_Translate' transform mode instead of 'Translation' mode " + "for translating keyframes in Dope Sheet Editor"); t->state = TRANS_CANCEL; } -- cgit v1.2.3 From e64ecaea4a93274147a6e5fc36a44ed42a7cd27f Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 2 Oct 2014 20:18:42 +0200 Subject: Code cleanup: calc_manipulator_stats is only used in manipulator (and soon will only use the context for such queries) --- source/blender/editors/transform/transform.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 31ef76f0bb9..8378c9f48ee 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2054,7 +2054,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve initTransInfo(C, t, op, event); if (t->spacetype == SPACE_VIEW3D) { - //calc_manipulator_stats(curarea); initTransformOrientation(C, t); t->draw_handle_apply = ED_region_draw_cb_activate(t->ar->type, drawTransformApply, t, REGION_DRAW_PRE_VIEW); -- cgit v1.2.3 From 50af4d208d7d2f3cbc789e91e54d87adf37590fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Oct 2014 08:09:00 +0200 Subject: Cleanup: spelling, ws --- source/blender/editors/transform/transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 8378c9f48ee..c7ff9f0089f 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4068,7 +4068,7 @@ static void initTranslation(TransInfo *t) /* this space uses time translate */ BKE_report(t->reports, RPT_ERROR, "Use 'Time_Translate' transform mode instead of 'Translation' mode " - "for translating keyframes in Dope Sheet Editor"); + "for translating keyframes in Dope Sheet Editor"); t->state = TRANS_CANCEL; } -- cgit v1.2.3 From cc02f929f9714b1661fa0b8e2ffedc1d23dd6fd6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Oct 2014 21:49:38 +0200 Subject: Cleanup: style --- source/blender/editors/transform/transform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c7ff9f0089f..24499688835 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -271,7 +271,8 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy) r_vec[0] = dx; r_vec[1] = dy; } - else { const float mval_f[2] = {(float)dx, (float)dy}; + else { + const float mval_f[2] = {(float)dx, (float)dy}; ED_view3d_win_to_delta(t->ar, mval_f, r_vec, t->zfac); } } -- cgit v1.2.3