Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-05 20:27:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-05 20:27:34 +0400
commit96865546333d5805a019729392f599c8dd66fc7a (patch)
treeda4e4b50ca8c59a1536a811abe6ccecdd39f169e /source/blender/editors/curve
parentede891808c0b2306bf4435e9dcefcabc9b7fa42c (diff)
Text3d: avoid assert, clamp position before getting the selection
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r--source/blender/editors/curve/editfont.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 1fbd3a0f9f5..ef3d7dae14c 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -1033,6 +1033,10 @@ static int move_cursor(bContext *C, int type, int select)
if (cursmove == -1)
return OPERATOR_CANCELLED;
+ if (ef->pos > ef->len) ef->pos = ef->len;
+ else if (ef->pos >= MAXTEXT) ef->pos = MAXTEXT;
+ else if (ef->pos < 0) ef->pos = 0;
+
if (select == 0) {
if (ef->selstart) {
struct Main *bmain = CTX_data_main(C);
@@ -1041,10 +1045,6 @@ static int move_cursor(bContext *C, int type, int select)
}
}
- if (ef->pos > ef->len) ef->pos = ef->len;
- else if (ef->pos >= MAXTEXT) ef->pos = MAXTEXT;
- else if (ef->pos < 0) ef->pos = 0;
-
text_update_edited(C, scene, obedit, select, cursmove);
if (select)