Merging with trunk up to r38631.

[blender-staging.git] / source / blender / editors / transform / transform.c

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index e1c41e7f763d5bd32dcb99528103a12581cdc99e..65a0657d2f341336797b48aa1cab2b72f00c1faf 100644 (file)
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -969,7 +969,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
                        break;
                case OKEY:
                        if (t->flag & T_PROP_EDIT && event->shift) {
-                               t->prop_mode = (t->prop_mode + 1) % 6;
+                               t->prop_mode = (t->prop_mode + 1) % PROP_MODE_MAX;
                                calculatePropRatio(t);
                                t->redraw |= TREDRAW_HARD;
                        }