Merge branch 'master' into blende2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 16 Dec 2018 23:25:40 +0000 (10:25 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 16 Dec 2018 23:25:40 +0000 (10:25 +1100)
commit9149e8942107343fb31639406124428e6ff1a029
treed33495dc55c5d50206437598ddcfffa24843be61
parentea33b90a1bf21061ab8a862d862db4dea048b28c
parent98f43ba3e4cb0a26eb62ea98e27a313265f8948c
Merge branch 'master' into blende2.8
13 files changed:
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_color_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_lamp_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_object_force_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/DNA_world_types.h