Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 06:50:11 +0000 (08:50 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 06:50:11 +0000 (08:50 +0200)
commit53e191e0a5e229dfff7a8bb1ac18e8dbd5120b31
tree278fa7155ca1a4c4a69a8c133d83cdb5db6bd0fe
parent8777b33699b2fc81bc503793599120d3dd86c9eb
parent597122d72b691ac6522b5ee2acd26e2b4b1135a5
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_text.py
release/scripts/startup/bl_ui/space_userpref.py