blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix (unreported) broken 'compse' feature when editing text. 

Looks like that code was not updated when we switched to unicode, it was
still returning axtended ascii codes (iso-8859-15 ones I think)...

That was breaking some chars, which have a very different value in
unicode. Found while working on Text section of the Manual! ;)
This commit is contained in:
Bastien Montagne 2019-07-08 16:09:28 +02:00
parent 9cb1810551
commit 6546442f4f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/curve/editfont.c
View File

@ -73,9 +73,9 @@ static int kill_selection(Object *obedit, int ins);
/************************* utilities ******************************/
static char findaccent(char char1, unsigned int code)
static wchar_t findaccent(wchar_t char1, unsigned int code)
{
char new = 0;
wchar_t new = 0;
if (char1 == 'a') {
if (code == '`') {
@ -170,7 +170,7 @@ static char findaccent(char char1, unsigned int code)
new = 186;
}
else if (code == 'e') {
new = 143;
new = 339;
}
else if (code == 'c') {
new = 169;
@ -191,7 +191,7 @@ static char findaccent(char char1, unsigned int code)
}
else if (char1 == 't') {
if (code == 'm') {
new = 153;
new = 8482;
}
}
else if (char1 == 'u') {
@ -342,7 +342,7 @@ static char findaccent(char char1, unsigned int code)
new = 247;
}
if (code == '|') {
new = 135;
new = 8224;
}
if (code == '+') {
new = 177;
@ -350,15 +350,15 @@ static char findaccent(char char1, unsigned int code)
}
else if (char1 == '|') {
if (code == '-') {
new = 135;
new = 8224;
}
if (code == '=') {
new = 136;
new = 8225;
}
}
else if (char1 == '=') {
if (code == '|') {
new = 136;
new = 8225;
}
}
else if (char1 == '+') {