Dan Eicher 89863f78a9 Whoops, revert r55854 and use r48292 as is ...

Turns out outliner_search_back() doesn't always return a valid scene...

2013-04-06 21:48:39 +00:00

..

avi

style cleanup:

2013-03-26 07:29:01 +00:00

blenfont

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00

blenkernel

Fix for a heap-use-after-free issue, reported by Lockal in the IRC.

2013-04-06 19:42:58 +00:00

blenlib

improved method of getting the tangent axis from a bmesh triangle,

2013-04-04 08:47:07 +00:00

blenloader

Pre-merger changes.

2013-04-06 14:45:50 +00:00

bmesh

svn merge ^/trunk/blender -r55815:55840

2013-04-06 13:24:34 +00:00

collada

misc minor edits.

2013-03-29 06:25:22 +00:00

compositor

code cleanup: include order

2013-04-05 17:56:54 +00:00

datatoc

avoid using strlen() for comparisons in for loops. for expanding whitespace in the text editor and ui paste.

2012-12-15 07:57:16 +00:00

editors

Whoops, revert r55854 and use r48292 as is

2013-04-06 21:48:39 +00:00

freestyle

quiet warnings (building with -Werror)

2013-04-04 11:47:48 +00:00

gpu

Fix for [#34754] "Revision 55527 provokes glitchy GLSL shadow map rendering" reported by Alain Ducharme. Per material uniforms and per object uniforms are now better separated.

2013-04-04 03:55:43 +00:00

ikplugin

code cleanup: favor braces when blocks have mixed brace use.

2013-03-09 03:46:30 +00:00

imbuf

correction to previous warning cleanup, also quiet shadow-warning for thumbnail size

2013-04-05 00:10:33 +00:00

makesdna

Pre-merger changes.

2013-04-06 14:45:50 +00:00

makesrna

Pre-merger changes.

2013-04-06 14:45:50 +00:00

modifiers

Fix for Freestyle face marks not effective with the Mirror modifier.

2013-04-03 18:26:51 +00:00

nodes

Node UI:

2013-04-06 12:07:42 +00:00

python

svn merge ^/trunk/blender -r55815:55840

2013-04-06 13:24:34 +00:00

quicktime

style cleanup:

2013-03-26 07:29:01 +00:00

render

Removed Freestyle-specific code from DerivedMesh.c.

2013-04-06 06:09:08 +00:00

windowmanager

svn merge ^/trunk/blender -r55815:55840

2013-04-06 13:24:34 +00:00

CMakeLists.txt

A major code update for making the DNA file specification of Freestyle settings

2013-03-23 03:00:37 +00:00

SConscript

A major code update for making the DNA file specification of Freestyle settings

2013-03-23 03:00:37 +00:00