Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 07:06:24 +0000 (18:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 07:06:24 +0000 (18:06 +1100)
commit3cb19a3d895bfe6c7bd6d5068bdc00cd94e4fb13
tree4a11b07c6b0f27309de23e7e66070c170282f8f9
parent639d49b01fdab537ed4782adcb4da260a9c2a854
parentad7fb1c028433621a9f71ab01bbda2ca827ffe74
Merge branch 'master' into blender2.8
release/scripts/modules/bpy_extras/object_utils.py
release/scripts/startup/bl_operators/add_mesh_torus.py
release/scripts/startup/bl_operators/object_quick_effects.py