Blender Git Loki
Git Commits -> Revision 27b3ea6
Revision 27b3ea6 by Dalai Felinto (cycles_camera_nodes) September 24, 2015, 15:24 (GMT) |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodes Note: the branch currently crashes in blender_camera_nodes.cpp: BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name]; The crash was introduced in: cb7cf523e5c000609f32a382e2c0fcc57f635a42 Conflicts: intern/cycles/SConscript intern/cycles/blender/addon/__init__.py intern/cycles/blender/addon/properties.py intern/cycles/blender/blender_camera.cpp intern/cycles/kernel/kernel_types.h intern/cycles/kernel/svm/svm.h intern/cycles/kernel/svm/svm_types.h intern/cycles/render/camera.cpp intern/cycles/render/camera.h |
Commit Details:
Full Hash: 27b3ea622f8bd313a8e2827dfec752bf2125566c
Parent Commits: 372dff8, de80e68