Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Sep 2017 15:23:47 +0000 (17:23 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 6 Sep 2017 15:23:47 +0000 (17:23 +0200)
commite2f42ff907313c56f57486ba923c9eb957520550
treebc9dc0e948cc376e031735af8d234c4e8390d34a
parentb41d34040b45b6634c3e81c93003326a3bf1d49a
parent82ede9de483426c3d88dc61afbb0b777c724b047
Merge branch 'master' into blender2.8
13 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mask/mask_ops.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_screw.c