Tamito Kajiyama
be50ce61be
Merged
...
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
2009-09-18 22:25:49 +00:00
Daniel Genrich
fd0072e77c
Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported!
2008-08-17 17:08:00 +00:00
Chris Want
5d0a207ecb
Patch from GSR that a) fixes a whole bunch of GPL/BL license
...
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Ken Hughes
f08200baa9
-- Change to make blender with game engine disabled build without errors
...
on 64-bit machines.
This code only seems to be used by the game engine anyway; maybe it's
only linux which always compiles it regardless of whether game engine is
enabled?
2005-11-27 03:47:17 +00:00
Kent Mein
209a2ede2c
Last of the config.h mods...
...
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
added to these files.
Kent
--
mein@cs.umn.edu
2002-11-25 15:29:57 +00:00
Hans Lambermont
12315f4d0e
Initial revision
2002-10-12 11:37:38 +00:00
