Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 4 Sep 2016 14:41:06 +0000 (16:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 4 Sep 2016 14:41:06 +0000 (16:41 +0200)
commit3c29aad787f636167319950636f1497442075df8
tree3a993cc25296ce987893b9f58b7c794b51e77f85
parent498583844fb7d0adbbc91d512f98885800cdf46e
parente76e8fcdcc53455a52a6a73495881eddd346472c
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/blender_particles.cpp
source/blender/blenkernel/intern/particle.c
source/blender/gpu/intern/gpu_shader.c
27 files changed:
intern/cycles/blender/addon/properties.py
intern/ghost/intern/GHOST_ContextWGL.cpp
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_shader.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c