Campbell Barton ae5fc40a63 svn merge ^/trunk/blender -r49256:49260

2012-07-26 17:15:28 +00:00

..

blender

svn merge ^/trunk/blender -r49256:49260

2012-07-26 17:15:28 +00:00

blenderplayer

Merging r49212 through r49222 from trunk into soc-2011-tomato

2012-07-25 19:46:23 +00:00

creator

svn merge ^/trunk/blender -r48937:48953

2012-07-16 08:48:06 +00:00

darwin

replace former applescript with an editable one

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

gameengine

Fix for [#32185] "Incorrect physics for LibLoaded dupligroups" reported by Daniel Stokes (Kupoman). I'm not sure if this is the "correct" fix, but it at least allows all physics objects to be evaluated at least once by the new environment. This allows the new environment to sync up physics shapes for static objects.

2012-07-26 09:35:52 +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