copied across changes which were missed by merging.

2011-05-09 02:45:52 +00:00
parent 6ef77cf95a
commit 14a2330d7b
138 changed files with 156 additions and 22164 deletions
--- a/intern/decimation/SConscript
+++ b/intern/decimation/SConscript
@@ -6,4 +6,3 @@ sources = env.Glob('intern/*.cpp')
 incs = '. ../moto/include ../container ../memutil'

 env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] )
-