91af8f2ae2
Merge branch 'master' into blender2.8
...
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
2017-11-06 18:02:46 +01:00
66a6d160fe
Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED.
...
This makes code closer to id_override/assent-engine ones, which
introduce a new type of linked data, and hence reserve
ID_IS_LINKED_DATABLOCK to real linked datablocks.
2017-11-06 17:17:10 +01:00
58dc114615
Merge branch 'master' into blender2.8
2017-11-06 00:12:28 +11:00
fbfda21fe4
UI: show tool-tips for each tools shortcuts
2017-11-05 01:29:52 +11:00
d4fe083b35
Merge branch 'master' into blender2.8
2017-11-04 21:45:52 +11:00
01a3c95609
UI: tool-tip refactor, don't hard code field types
...
Allow other kinds of tips be created w/o exceeding hard limits.
2017-11-04 21:15:18 +11:00
3a7a7ed03b
Merge branch 'master' into blender2.8
2017-11-03 21:22:27 +11:00
2a87bd8995
Cleanup: split interface_regions.c
...
Each region type is quite separate and file was getting too big.
2017-11-03 20:57:09 +11:00
