Campbell Barton 1ff373ef5b svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

..

avi

replace octal 0177 with 127 to be more clear, no functional change.

2011-08-27 03:34:11 +00:00

blenfont

minor edits to ascii draw function, unused var warning.

2011-09-14 02:45:44 +00:00

blenkernel

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

blenlib

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

blenloader

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

blenpluginapi

svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-01 00:56:21 +00:00

bmesh

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

collada

fix for opencollada crash with r40164, missing NULL check.

2011-09-12 13:59:23 +00:00

editors

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

gpu

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

ikplugin

cmake: cleanup include paths, some duplicates and going up some unneeded dirs.

2011-07-17 09:11:13 +00:00

imbuf

use replace 0 with NULL for pointers, set some functions static

2011-09-16 08:20:21 +00:00

makesdna

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

makesrna

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

modifiers

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

nodes

use replace 0 with NULL for pointers, set some functions static

2011-09-16 08:20:21 +00:00

python

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

quicktime

cmake: cleanup include paths, some duplicates and going up some unneeded dirs.

2011-07-17 09:11:13 +00:00

render

svn merge -r40166:40279 ^/trunk/blender

2011-09-17 04:59:14 +00:00

windowmanager

svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-11 08:28:16 +00:00

CMakeLists.txt

svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c

2011-09-01 00:35:30 +00:00

SConscript

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

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