Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-06Merge branch 'master' into blender2.8Bastien Montagne
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-06Rename ID_IS_LINKED_DATABLOCK to ID_IS_LINKED.Bastien Montagne
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-05Merge branch 'master' into blender2.8Campbell Barton
2017-11-04UI: show tool-tips for each tools shortcutsCampbell Barton
2017-11-04Merge branch 'master' into blender2.8Campbell Barton
2017-11-04UI: tool-tip refactor, don't hard code field typesCampbell Barton
Allow other kinds of tips be created w/o exceeding hard limits.
2017-11-03Merge branch 'master' into blender2.8Campbell Barton
2017-11-03Cleanup: split interface_regions.cCampbell Barton
Each region type is quite separate and file was getting too big.