Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

avi

remove nan-makefiles

2011-01-30 15:29:22 +00:00

blenfont

fix for error building.

2011-02-13 12:50:40 +00:00

blenkernel

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

blenlib

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

blenloader

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

blenpluginapi

remove nan-makefiles

2011-01-30 15:29:22 +00:00

collada

enforce string limits (reported by pedantic checking tools & some developers).

2011-02-13 03:21:27 +00:00

editors

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

freestyle

Made stroke rendering stability fixes, with the aim of addressing

2011-01-31 20:57:39 +00:00

gpu

warning cleanup.

2011-02-13 15:02:21 +00:00

ikplugin

remove nan-makefiles

2011-01-30 15:29:22 +00:00

imbuf

warning cleanup.

2011-02-13 15:02:21 +00:00

makesdna

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

makesrna

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

modifiers

many functions in blender are not marked static but should be.

2011-02-13 14:16:36 +00:00

nodes

Patch 26068

2011-02-13 14:55:39 +00:00

python

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

quicktime

remove nan-makefiles

2011-01-30 15:29:22 +00:00

readblenfile

remove nan-makefiles

2011-01-30 15:29:22 +00:00

render

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

windowmanager

warning cleanup.

2011-02-13 15:02:21 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 33765.

2010-12-18 11:49:12 +00:00

SConscript

Merged changes in the trunk up to revision 31190.

2010-08-09 11:32:55 +00:00