Merged revision(s) 58682-58770 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 18:14:18 +0000 (18:14 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 18:14:18 +0000 (18:14 +0000)
1  2 
intern/cycles/blender/blender_session.cpp
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c

Simple merge
Simple merge