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)
commita3e34e5fbc0f6ec894519eedb0fc85491d45ec17
tree77736a9e1f1bac0c47dce55a1e3a8d48b602e21d
parentb01b2c4e8d66b6477755d6c2a840f4019fb03658
parentc15ae082bb3bcb379c343aa770601b49c0866583
Merged revision(s) 58682-58770 from trunk/blender into soc-2013-dingto.
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