Blender Git Loki

Blender Git "greasepencil-object" branch commits.

Page: 218 / 345

June 4, 2018, 13:34 (GMT)
Merge branch 'blender2.8' into greasepencil-object
June 4, 2018, 09:28 (GMT)
Merge branch '28' into greasepencil-object
June 4, 2018, 09:26 (GMT)
Merge branch '28' into greasepencil-object
June 4, 2018, 07:06 (GMT)
Merge branch 'blender2.8' into greasepencil-object
June 4, 2018, 02:14 (GMT)
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Conflicts:
release/scripts/addons
release/scripts/addons_contrib
June 4, 2018, 02:11 (GMT)
Included DPIX Code, prevent compile.
June 3, 2018, 14:20 (GMT)
Merge branch 'blender2.8' into greasepencil-object
June 3, 2018, 07:41 (GMT)
Merge branch 'blender2.8' into greasepencil-object
June 1, 2018, 17:38 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/object.c
June 1, 2018, 13:35 (GMT)
Remap mode keymaps and solve merge issue

The keymap has been changed and there was a merge error.
June 1, 2018, 13:20 (GMT)
Merge branch 'blender2.8' into greasepencil-object
June 1, 2018, 11:21 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_material.c
June 1, 2018, 08:02 (GMT)
More fixes after merge
June 1, 2018, 07:19 (GMT)
Fix parameter values after merge

This python function needs different settings after merge.
June 1, 2018, 07:13 (GMT)
Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_topbar.py
May 31, 2018, 21:09 (GMT)
UI: Hide weight tools for non GP Objects

This poll method was missing in previous commit
May 31, 2018, 17:26 (GMT)
Merge branch 'blender2.8' into greasepencil-object
May 31, 2018, 16:19 (GMT)
Merge branch 'blender2.8' into greasepencil-object
May 31, 2018, 15:03 (GMT)
Fix color picker panel position

This is ahack to avoid the panel is shifted to the right. It looks the function to calculate the visible rect is using the toolbar size, but the view is full width.
May 31, 2018, 14:50 (GMT)
Merge branch 'blender2.8' into greasepencil-object
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021