Tamito Kajiyama bb1f8d9586 Merged changes in the trunk up to revision 46309. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c

2012-05-05 11:40:42 +00:00

..

avi

style cleanup: guys - set your editors to tabs!

2012-05-01 17:51:03 +00:00

blenfont

Renamed "fake" OpenGL identifiers.

2012-05-04 11:50:11 +00:00

blenkernel

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

blenlib

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

blenloader

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

blenpluginapi

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

bmesh

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

collada

code cleanup: brush/camera naming

2012-05-05 00:58:22 +00:00

editors

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

freestyle

Fix for a crash due to a corruption of data for addressing degenerate triangles in imported mesh data.

2012-05-01 18:46:15 +00:00

gpu

Renamed "fake" OpenGL identifiers.

2012-05-04 11:50:11 +00:00

ikplugin

style cleanup: whitespace / commas

2012-04-29 15:47:02 +00:00

imbuf

Fix #31286: saving 16 bit BW tiff could crash due to invalid memory access. Also

2012-05-04 09:25:09 +00:00

makesdna

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

makesrna

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

modifiers

Style Cleanup: Wrapping with parens for safety and whitespace edits

2012-05-05 05:46:45 +00:00

nodes

code cleanup: brush/camera naming

2012-05-05 00:58:22 +00:00

python

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

quicktime

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

render

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

windowmanager

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

SConscript

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00