Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jan 2018 06:21:15 +0000 (17:21 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jan 2018 06:21:15 +0000 (17:21 +1100)
commitc850320b35863edc35f0b0acd1c75ed48bb71542
treec3de2f92410308c0ece880a901864727b5731fc3
parent4d3d002b653c5b28320ada6b9d7f1e8c80bf944c
parent7a24e0d175827824d139f7627de2a5af34d687fb
Merge branch 'master' into blender2.8
12 files changed:
source/blender/blenkernel/BKE_world.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/pose_select.c
source/blender/editors/render/render_preview.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_access.c