diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-02-28 15:49:18 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-02-28 15:49:18 +0300 |
| commit | 99919b1714ed79bbf10dbe057630ad0f0903c905 (patch) | |
| tree | 1fb219c23a8799d327d2472b4d58aba96dd3212b /source/blender/readblenfile | |
| parent | d71d78e40d9e367a48a2f4fe15913088781686ee (diff) | |
| parent | badbba7266cf27deaaf7e704b2b751d9023054a8 (diff) | |
merge with trunk. also tried to fix tesselator code; new code should've worked, but there's still some problems, possibly not in the tesselator code entirely. also still have reverted tools/Blender.py since scons still isn't fixed, heh.
Diffstat (limited to 'source/blender/readblenfile')
| -rw-r--r-- | source/blender/readblenfile/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/intern/BLO_readblenfile.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript index 59771aa0829..430c53e3ef0 100644 --- a/source/blender/readblenfile/SConscript +++ b/source/blender/readblenfile/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c') incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging' -env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 220] ) +env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [155, 220] ) diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c index 40a991ad702..496ac529406 100644 --- a/source/blender/readblenfile/intern/BLO_readblenfile.c +++ b/source/blender/readblenfile/intern/BLO_readblenfile.c @@ -170,4 +170,3 @@ cleanup: return bfd; } - |