Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 2 Sep 2017 10:08:02 +0000 (20:08 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 2 Sep 2017 10:08:02 +0000 (20:08 +1000)
commit7dfcbe01b0a2a1ca625c80eb385bf4753b3fb3ef
tree89173fc91b491f51536dfae9ea3f36241709d1cc
parent39f8b245d47be42698442d679eca6ddd45add4e9
parent3750389ce3f3b6b386986c33608d6aed348e6f7e
Merge branch 'master' into blender2.8
12 files changed:
release/scripts/startup/bl_ui/properties_data_lamp.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_game.py
release/scripts/startup/bl_ui/properties_paint_common.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_node.py
release/scripts/startup/bl_ui/space_outliner.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py