Campbell Barton a006b98c6c fix for issue with bevel when the 2 edges form a straight line. this isnt really fixing the bigger problems but the error did show up baddly as an artifact.		2012-02-19 04:13:52 +00:00
..
avi	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
blenfont	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
blenkernel	svn merge ^/trunk/blender -r44213:44235 --- fixes bmesh shading bug [#30125]	2012-02-19 03:19:58 +00:00
blenlib	Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.	2012-02-19 03:10:11 +00:00
blenloader	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
blenpluginapi	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
bmesh	fix for issue with bevel when the 2 edges form a straight line. this isnt really fixing the bigger problems but the error did show up baddly as an artifact.	2012-02-19 04:13:52 +00:00
collada	svn merge ^/trunk/blender -r44213:44235 --- fixes bmesh shading bug [#30125]	2012-02-19 03:19:58 +00:00
editors	minor bmesh api changes.	2012-02-18 11:44:30 +00:00
gpu	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
ikplugin	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
imbuf	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
makesdna	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
makesrna	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
modifiers	minor bmesh api changes.	2012-02-18 11:44:30 +00:00
nodes	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
python	patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes	2012-02-17 19:21:47 +00:00
quicktime	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
render	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +00:00
windowmanager	svn merge ^/trunk/blender -r44189:44204	2012-02-17 20:56:25 +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