X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.cpp;h=23e9580047367054162ffd80152ab05b1f0258f5;hb=a93e9a8c03f239eb067331491d3a276c696b27ea;hp=b721476025c3176b68a80bfab48c1201ddbe05c2;hpb=5f7270118adc2dfb2ee86d869e2de55d91b557e5;p=synfig.git diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp index b721476..23e9580 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -148,12 +148,14 @@ Layer_Freetype::new_font_(const synfig::String &font_fam_, int style, int weight //end evil hack if(font_fam=="arial black") + { #ifndef __APPLE__ - if(new_face("ariblk")) + if(new_face("ariblk")) return true; else #endif font_fam="sans serif"; + } if(font_fam=="sans serif" || font_fam=="arial") { @@ -463,9 +465,9 @@ Layer_Freetype::set_param(const String & param, const ValueBase &value) IMPORT_PLUS(size, if(old_version){size/=2.0;} needs_sync_=true ); IMPORT_PLUS(text,needs_sync_=true); IMPORT_PLUS(pos,needs_sync_=true); - IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) { + IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) { set_blend_method(Color::BLEND_ALPHA_OVER); - color.set_a(1); } else transparent_color_ = true; }); + color.set_a(1); } else transparent_color_ = true; } }); IMPORT(invert); IMPORT_PLUS(orient,needs_sync_=true); IMPORT_PLUS(compress,needs_sync_=true);