← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/blenfont/intern/blf_dir.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenfont/intern/blf_dir.c
41
41
 
42
42
#include "DNA_vec_types.h"
43
43
 
44
 
#include "BKE_utildefines.h"
45
 
 
46
 
#include "BLI_blenlib.h"
 
44
#include "BLI_fileops.h"
 
45
#include "BLI_listbase.h"
 
46
#include "BLI_path_util.h"
 
47
#include "BLI_string.h"
47
48
 
48
49
#include "BIF_gl.h"
49
50
 
163
164
                        file[i] = str[i];
164
165
 
165
166
                file[i] = '.';
166
 
                file[i+1] = 't';
167
 
                file[i+2] = 't';
168
 
                file[i+3] = 'f';
169
 
                file[i+4] = '\0';
 
167
                file[i + 1] = 't';
 
168
                file[i + 2] = 't';
 
169
                file[i + 3] = 'f';
 
170
                file[i + 4] = '\0';
170
171
                s++;
171
172
                *size = atoi(s);
172
173
                return 1;