Blender Git Loki

/intern/cycles/blender/addon/engine.py (+2, -2) (Diff)
/intern/cycles/blender/addon/properties.py (+12, -4) (Diff)
/intern/cycles/blender/addon/ui.py (+0, -32) (Diff)
/intern/cycles/blender/addon/__init__.py (+2, -2) (Diff)
/intern/cycles/blender/blender_python.cpp (+3, -3) (Diff)
/intern/cycles/blender/blender_session.cpp (+19, -42) (Diff)
/intern/cycles/blender/blender_session.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_bake.h (+88, -122) (Diff)
/intern/cycles/kernel/kernel_types.h (+8, -60) (Diff)
/intern/cycles/render/bake.cpp (+13, -28) (Diff)
/intern/cycles/render/bake.h (+2, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+0, -1) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+0, -8) (Diff)
/source/blender/editors/object/object_bake_api.c (+8, -16) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -17) (Diff)
/source/blender/makesrna/intern/rna_render.c (+2, -20) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+0, -64) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+0, -3) (Diff)
/source/blender/render/extern/include/RE_bake.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_engine.h (+1, -1) (Diff)
/source/blender/render/intern/source/external_engine.c (+2, -3) (Diff)