← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/font.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/font.c
2
2
/*  font.c     
3
3
 *  
4
4
 * 
5
 
 * $Id: font.c,v 1.8 2004/01/16 14:50:22 phase Exp $
 
5
 * $Id: font.c,v 1.12 2005/03/19 21:08:10 zuster Exp $
6
6
 *
7
7
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
8
8
 *
42
42
#include <config.h>
43
43
#endif
44
44
 
45
 
#ifdef WIN32
46
 
#include "BLI_winstuff.h"
47
 
#endif
48
45
#include "MEM_guardedalloc.h"
49
46
 
50
47
#include "BLI_arithb.h"
53
50
 
54
51
#include "DNA_packedFile_types.h"
55
52
#include "DNA_curve_types.h"
56
 
#include "DNA_mesh_types.h"
57
53
#include "DNA_object_types.h"
58
54
#include "DNA_view3d_types.h"
59
55
#include "DNA_vfont_types.h"
142
138
                        } else {
143
139
                                pf= newPackedFile(vfont->name);
144
140
                        }
 
141
                        if(!pf) {
 
142
                                printf("Font file doesn't exist: %s\n", vfont->name);
 
143
 
 
144
                                strcpy(vfont->name, "<builtin>");
 
145
                                pf= get_builtin_packedfile();
 
146
                        }
145
147
                }
146
148
                
147
149
                if (pf) {
241
243
                        nu2->resolu= cu->resolu;
242
244
                        nu2->bp = 0;
243
245
                        nu2->knotsu = nu2->knotsv = 0;
244
 
                        nu2->flag= ME_SMOOTH;
 
246
                        nu2->flag= CU_SMOOTH;
245
247
                        /* nu2->trim.first = 0; */
246
248
                        /* nu2->trim.last = 0; */
247
249
                        i = nu2->pntsu;
510
512
                                CLAMP(ctime, 0.0, 1.0);
511
513
 
512
514
                                /* calc the right loc AND the right rot separately */
 
515
                                /* vec, tvec need 4 items */
513
516
                                where_on_path(cu->textoncurve, ctime, vec, tvec);
514
517
                                where_on_path(cu->textoncurve, ctime+dtime, tvec, rotvec);
515
518