Sergey Sharybin 0c087e5154 Merging r48928 through r48937 from trunk into soc-2011-tomato

2012-07-15 10:51:36 +00:00

..

blender

Merging r48928 through r48937 from trunk into soc-2011-tomato

2012-07-15 10:51:36 +00:00

blenderplayer

svn merge ^/trunk/blender -r48333:48370

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

creator

svn merge ^/trunk/blender -r48868:48888

2012-07-13 12:06:31 +00:00

darwin

replace former applescript with an editable one

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

gameengine

BGE: Better fix for the textures not working with custom shaders regression. Now custom shaders work, and textures aren't uploaded twice for GLSL materials (my earlier fix had some bad logic).

2012-07-14 04:43:32 +00:00

icons

…

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