[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32037] trunk/blender/source/blender: bugfix [#23923] extra material slots created
Campbell Barton
ideasman42 at gmail.com
Tue Sep 21 08:09:15 CEST 2010
Revision: 32037
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32037
Author: campbellbarton
Date: 2010-09-21 08:09:14 +0200 (Tue, 21 Sep 2010)
Log Message:
-----------
bugfix [#23923] extra material slots created
Modified Paths:
--------------
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/makesdna/DNA_curve_types.h
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2010-09-21 04:53:28 UTC (rev 32036)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2010-09-21 06:09:14 UTC (rev 32037)
@@ -236,10 +236,7 @@
ef->textbuf[cu->pos]= c;
ef->textbufinfo[cu->pos] = cu->curinfo;
ef->textbufinfo[cu->pos].kern = 0;
- if(obedit->actcol>0)
- ef->textbufinfo[cu->pos].mat_nr = obedit->actcol;
- else
- ef->textbufinfo[cu->pos].mat_nr = 0;
+ ef->textbufinfo[cu->pos].mat_nr = obedit->actcol;
cu->pos++;
cu->len++;
@@ -257,14 +254,10 @@
{
Curve *cu= obedit->data;
EditFont *ef= cu->editfont;
-
- if(cu->pos)
- cu->curinfo = ef->textbufinfo[cu->pos-1];
- else
- cu->curinfo = ef->textbufinfo[0];
+ cu->curinfo = ef->textbufinfo[cu->pos?cu->pos-1:0];
if(obedit->totcol>0)
- obedit->actcol= ef->textbufinfo[cu->pos-1].mat_nr;
+ obedit->actcol= ef->textbufinfo[cu->pos?cu->pos-1:0].mat_nr;
update_string(cu);
BKE_text_to_curve(scene, obedit, mode);
Modified: trunk/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_curve_types.h 2010-09-21 04:53:28 UTC (rev 32036)
+++ trunk/blender/source/blender/makesdna/DNA_curve_types.h 2010-09-21 06:09:14 UTC (rev 32037)
@@ -141,7 +141,7 @@
typedef struct CharInfo {
short kern;
- short mat_nr;
+ short mat_nr; /* index start at 1, unlike mesh & nurbs */
char flag;
char pad;
short pad2;
More information about the Bf-blender-cvs
mailing list