Tamito Kajiyama
a42ba82f63
Merged changes in the trunk up to revision 50829.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
Campbell Barton
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Nathan Letwory
94f3851840
doxygen: gameengine/GamePlayer tagged.
2011-02-25 13:35:11 +00:00
Nathan Letwory
5b607701a7
doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
Campbell Barton
8f1500da00
remove config.h references, was added for automake build system rev around 124-126 but isnt used by any build systems now.
2010-04-18 10:28:37 +00:00
Campbell Barton
081c1205a3
correct fsf address
2010-02-12 13:34:04 +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
Kester Maddock
08c14c7ca0
Mouse Wheel Support for the Game Engine.
...
This adds "Wheel Up" and "Wheel Down" as choices to the Mouse sensor brick.
2004-05-02 23:45:03 +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