Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 25 Oct 2016 11:18:41 +0000 (11:18 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 25 Oct 2016 11:18:41 +0000 (11:18 +0000)
commitb4f849b9c645125946d688262c2f1f9dceb83899
tree04e452cf454ba21b885e3634f6daaddf46b3e8f4
parent392551bd95e0267c86d9275423b69ea7637eb505
parent3e7100644861368b5ec951cf36c631e0828012f8
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/blender/blender_sync.h
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/context.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/object/object_relations.c
source/blender/editors/screen/screen_edit.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_sculpt_paint.c