svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 04:17:43 +0000 (04:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Nov 2011 04:17:43 +0000 (04:17 +0000)
commit121ff4223dbd5c42ecc4919d09ce464d01faf4e7
tree5102e8d4f18a142aaff07fc355d0fd0208ccf651
parenta96c3ce9e0a61bc29fef8212a742658795aabbed
parent77c51607914b7fe4744437f6d47fedab628b444d
svn merge -r41655:41715 ^/trunk/blender  ---  this is the real cycles merge, needs some edits to cycles its self before cycles will build
CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_object_api.c
source/creator/CMakeLists.txt