Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 12:53:03 +0000 (23:53 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 12:53:03 +0000 (23:53 +1100)
commit1c7cfa025c87e8f31790b48cbb189949f7949ad1
tree3869d475a9d10c005b0bb8006eb77bf55f1903d3
parent46f518e92790a04885f4e047bb59b11019d73aa3
parent2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1
Merge branch 'master' into blender2.8
33 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/linestyle.c
source/blender/collada/DocumentImporter.cpp
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/draw/intern/draw_cache_impl_lattice.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/draw/intern/draw_common.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/object/object_add.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_texture.c
source/blender/modifiers/intern/MOD_array.c
source/blender/nodes/shader/node_shader_util.h
source/blender/nodes/shader/nodes/node_shader_valToRgb.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/shadeoutput.c