Sergey Sharybin dfad263219 Merging r46456 through r46468 from trunk into soc-2011-tomato		2012-05-09 15:37:56 +00:00
..
avi	style cleanup: whitespace/operators	2012-05-09 09:24:15 +00:00
blenfont	Renamed "fake" OpenGL identifiers.	2012-05-04 11:50:11 +00:00
blenkernel	Merging r46456 through r46468 from trunk into soc-2011-tomato	2012-05-09 15:37:56 +00:00
blenlib	style cleanup: whitespace/operators	2012-05-09 09:24:15 +00:00
blenloader	Merging r46414 through r46455 from trunk into soc-2011-tomato	2012-05-09 09:41:27 +00:00
blenpluginapi	code cleanup: header cleanup	2012-04-30 14:24:11 +00:00
bmesh	fix for limited dissolve (after sine intended fixes - not cleaning up before vertex dissolve would skip dissolving some verts that should be dissolved).	2012-05-06 18:37:08 +00:00
collada	style cleanup: whitespace/operators	2012-05-09 09:24:15 +00:00
editors	Merging r46456 through r46468 from trunk into soc-2011-tomato	2012-05-09 15:37:56 +00:00
gpu	Fix for recent changes in glsl	2012-05-09 10:14:01 +00:00
ikplugin	code cleanup: naming - pose/armature/image	2012-05-05 16:03:57 +00:00
imbuf	style cleanup: png	2012-05-09 15:21:45 +00:00
makesdna	Merging r46414 through r46455 from trunk into soc-2011-tomato	2012-05-09 09:41:27 +00:00
makesrna	Merging r46414 through r46455 from trunk into soc-2011-tomato	2012-05-09 09:41:27 +00:00
modifiers	Refactor of modifiers' apply function: now use a single bit-flag parameter to pass options, instead of having one parameter per boolean flag (i.e. replaces current useRenderParams and isFinalCalc by a single ModifierApplyFlag flag. ModifierApplyFlag is an enum defined in BKE_modifier.h). This way we won't anymore have to edit all modifier files when e.g. adding a new control flag!	2012-05-09 15:00:26 +00:00
nodes	Merging r46456 through r46468 from trunk into soc-2011-tomato	2012-05-09 15:37:56 +00:00
python	classic compile error: GLEW_STATIC needs to be define when we use opengl functions	2012-05-09 09:49:24 +00:00
quicktime	code cleanup: header cleanup	2012-04-30 14:24:11 +00:00
render	code cleanup: color/bw conversion - use BLI color function.	2012-05-09 10:48:24 +00:00
windowmanager	Merging r46203 through r46413 from trunk into soc-2011-tomato	2012-05-08 13:01:16 +00:00
CMakeLists.txt	Tomato: initial commit of mask editing tools into SVN	2012-04-30 07:43:21 +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