Sergey Sharybin 8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato

2012-07-12 12:12:21 +00:00

..

blender

Merging r48829 through r48861 from trunk into soc-2011-tomato

2012-07-12 12:12:21 +00:00

blenderplayer

svn merge ^/trunk/blender -r48333:48370

2012-06-28 11:20:19 +00:00

creator

svn merge ^/trunk/blender -r48691:48729

2012-07-08 15:55:58 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

Scaling non-power-of-two (NPOT) textures to powers of two is really time consuming and not necessary on graphics cards that can support NPOT textures. So, if the graphics card has NPOT texture support, don't bother scaling. If this patch causes issues, it can always be reverted and applied to Swiss instead.

2012-07-10 19:23:57 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

code cleanup: remove mode comments, these were applied very un-evenly across a few files.

2012-05-27 13:22:43 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Scons:

2012-06-30 22:44:36 +00:00