[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33933] trunk/blender/source/blender/ editors/curve/editfont.c: Bugfix #25397

[Dalai Felinto]

A font added with relative path is not being included in the global_font
list (see bug #25538 -
http://projects.blender.org/tracker/index.php?func=detail&aid=25538&group_id=9&atid=306
 )

--
Dalai
www.dalaifelinto.com

2010/12/29 Ton Roosendaal <ton at blender.org>

> Revision: 33933
>
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33933
> Author:   ton
> Date:     2010-12-29 12:34:02 +0100 (Wed, 29 Dec 2010)
>
> Log Message:
> -----------
> Bugfix #25397
>
> Loading a vector font (.ttf) didn't have option for Relative Path
> in the file window. Now it does, and it sets it to the default.
>
> Todo note: the actual path is not visible in the UI yet, nor does
> outliner RNA view allow to edit path.
>
> Modified Paths:
> --------------
>    trunk/blender/source/blender/editors/curve/editfont.c
>
> Modified: trunk/blender/source/blender/editors/curve/editfont.c
> ===================================================================
> --- trunk/blender/source/blender/editors/curve/editfont.c       2010-12-29
> 11:00:59 UTC (rev 33932)
> +++ trunk/blender/source/blender/editors/curve/editfont.c       2010-12-29
> 11:34:02 UTC (rev 33933)
> @@ -1705,7 +1705,10 @@
>        }
>
>        path = (font && strcmp(font->name, FO_BUILTIN_NAME) != 0)?
> font->name: U.fontdir;
> -
> +
> +       if(!RNA_property_is_set(op->ptr, "relative_path"))
> +               RNA_boolean_set(op->ptr, "relative_path", U.flag &
> USER_RELPATHS);
> +
>        if(RNA_property_is_set(op->ptr, "filepath"))
>                return open_exec(C, op);
>
> @@ -1730,7 +1733,7 @@
>        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
>
>        /* properties */
> -       WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE,
> FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH);
> +       WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE,
> FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH);
>  }
>
>  /******************* delete operator *********************/
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>