diff options
| author | Alexander Ewering <blender@instinctive.de> | 2005-06-26 02:51:51 +0400 |
|---|---|---|
| committer | Alexander Ewering <blender@instinctive.de> | 2005-06-26 02:51:51 +0400 |
| commit | 08169d7fbaedd09bec2966c89427dfaa4fd1e78b (patch) | |
| tree | 171086e4db7043a3854f2c45c9cc25afc146020b /source/blender/src/editfont.c | |
| parent | da76fc6e030be569f002b568ae59574d809992fb (diff) | |
The overlapping curves/material indices problem got a bit out of control.
- For avoiding the 'overlapping character problem' in Text objects, I had
changed the sorting code for filling nurbs to use nu->charidx (a new
variable incremented with each new character) instead of nu->mat_nr
(which used to work for material indices inside a 2D Curve).
- This broke material indices in normal 2D Curves completely, thus:
- nu->charidx is now not only used for seperating
characters in text objects for filling, but also for normal 2D curves
when they contain material indices. In fact, charidx is just set to
the material index.
- There's compatibility code in readfile.c that sets nu->charidx to nu->mat_nr
when reading curves from files that are not text objects
- So, the big conclusion: Instead of using material indices for creating
'filling groups', filldisplist() now uses nu->charidx, which is set
appropriately when reading old files and assigning/deleting material
indices in curves.
- This is all pretty obscure and hard to explain. If I haven't been clear,
ask.
- If it breaks anything, complain!
Diffstat (limited to 'source/blender/src/editfont.c')
| -rw-r--r-- | source/blender/src/editfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index 0d6533a177c..347376181b8 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -700,7 +700,7 @@ void do_textedit(unsigned short event, short val, char _ascii) else if (G.qual & LR_ALTKEY) { kern = textbufinfo[cu->pos-1].kern; kern += 1; - if (kern>10) kern = 10; + if (kern>20) kern = 20; textbufinfo[cu->pos-1].kern = kern; doit = 1; } @@ -720,7 +720,7 @@ void do_textedit(unsigned short event, short val, char _ascii) else if (G.qual & LR_ALTKEY) { kern = textbufinfo[cu->pos-1].kern; kern -= 1; - if (kern<-10) kern = -10; + if (kern<-20) kern = -20; textbufinfo[cu->pos-1].kern = kern; doit = 1; } |