Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Dec 2016 15:17:57 +0000 (16:17 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Dec 2016 15:17:57 +0000 (16:17 +0100)
commit9be6d5ff18fd593e853647d9eec8b3fb074acd7c
tree485fb9203c310b5119a549e698db241012ed39ff
parent54528079e3cfaf74eaa119615386564820b45276
parent5f852a4324212221500d11b2c7594f5e0ca894c6
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c
41 files changed:
CMakeLists.txt
build_files/build_environment/install_deps.sh
intern/cycles/blender/addon/properties.py
release/scripts/startup/bl_operators/object_quick_effects.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_smoke.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_rigidbody.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/creator_args.c