Revision: 36003 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36003 Author: nazgul Date: 2011-04-04 16:19:18 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Fix #26781: Assigning multiple Materials to Text seems not to work correctly
Problems was in 0-based numbering vs. 1-based. Fonts are getting converted to displists when they're displaying and here base conversion happens, so no need in conversion when assigning material to selected text. This makes indices more inconsistant, but saves compatibility in both of directions. Maybe in further releases we'll make indices consistent. Modified Paths: -------------- trunk/blender/source/blender/editors/render/render_shading.c Modified: trunk/blender/source/blender/editors/render/render_shading.c =================================================================== --- trunk/blender/source/blender/editors/render/render_shading.c 2011-04-04 15:15:45 UTC (rev 36002) +++ trunk/blender/source/blender/editors/render/render_shading.c 2011-04-04 16:19:18 UTC (rev 36003) @@ -359,7 +359,7 @@ if(ef && BKE_font_getselection(ob, &selstart, &selend)) { for(i=selstart; i<=selend; i++) - ef->textbufinfo[i].mat_nr = ob->actcol-1; + ef->textbufinfo[i].mat_nr = ob->actcol; } } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs