Campbell Barton aed306f219 recent merges lost changes in this file, manually merge changes from -r37078:37500

2011-07-25 10:14:02 +00:00

..

avi

cmake maintenance

2011-05-31 01:15:44 +00:00

blenfont

cmake maintenance

2011-05-31 01:15:44 +00:00

blenkernel

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

blenlib

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

blenloader

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

blenpluginapi

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

bmesh

Extrude Bug Fixes:

2011-07-11 09:27:21 +00:00

collada

Fix [#27463] COLLADA light quadratic attenuation exported wrong?

2011-06-13 15:07:36 +00:00

editors

recent merges lost changes in this file, manually merge changes from -r37078:37500

2011-07-25 10:14:02 +00:00

gpu

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

ikplugin

cmake maintenance

2011-05-31 01:15:44 +00:00

imbuf

adding .m4a video extension

2011-06-17 08:50:47 +00:00

makesdna

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

makesrna

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

modifiers

svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:03:48 +00:00

nodes

Fix for GLSL material node inside groups. These were using the GPULink point from the input stack argument, but this only exists for directly linked nodes. If a node is linked directly to a group socket, which is not linked externally, the stack argument is actually the external group input.

2011-06-09 16:05:34 +00:00

python

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

quicktime

cmake maintenance

2011-05-31 01:15:44 +00:00

render

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

windowmanager

svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-24 13:21:54 +00:00

CMakeLists.txt

svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-12 05:35:19 +00:00

SConscript

svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-12 05:35:19 +00:00