Campbell Barton 98bdf0274b svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

..

avi

style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)

2011-12-17 00:52:36 +00:00

blenfont

Move glTexEnvi to draw__start/draw__end.

2012-01-06 16:40:57 +00:00

blenkernel

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

blenlib

rename normal calc functions.

2012-01-06 00:08:37 +00:00

blenloader

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

blenpluginapi

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

bmesh

alternate fix for r43166

2012-01-05 13:21:01 +00:00

collada

rename normal calc functions.

2012-01-06 00:08:37 +00:00

editors

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

gpu

svn merge ^/trunk/blender -r43092:43092

2012-01-04 06:20:10 +00:00

ikplugin

Math lib: matrix multiplication order fix for two functions that were

2011-12-16 19:53:12 +00:00

imbuf

use warnigns for all msvc configurations

2012-01-06 05:13:36 +00:00

makesdna

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

makesrna

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

modifiers

rename

2012-01-06 02:59:28 +00:00

nodes

Improved auto-hiding of unused sockets for collapsed nodes.

2012-01-08 10:23:19 +00:00

python

add bpy collection method .find(key), so you can get the index of an item in a collection, -1 if not found.

2012-01-05 06:05:45 +00:00

quicktime

style edits for function declarations

2011-12-30 07:55:15 +00:00

render

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

windowmanager

svn merge ^/trunk/blender -r43183:43220

2012-01-08 13:09:09 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r42372:42416

2011-12-04 18:39:19 +00:00

SConscript

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00