Blender Git Loki

Blender Git "greasepencil-object" branch commits.

Page: 122 / 345

August 8, 2019, 15:20 (GMT)
Merge branch 'master' into greasepencil-object
August 8, 2019, 14:57 (GMT)
GPencil: Fix merge duplication
August 8, 2019, 14:50 (GMT)
Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/intern/gpencil.c
August 8, 2019, 13:55 (GMT)
GPencil: Fix merge error
August 8, 2019, 13:49 (GMT)
Merge branch 'master' into greasepencil-object
August 8, 2019, 08:47 (GMT)
Merge branch 'master' into greasepencil-object
August 8, 2019, 08:42 (GMT)
Merge branch 'master' into greasepencil-object
August 8, 2019, 08:34 (GMT)
Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
August 7, 2019, 18:12 (GMT)
GPencil: Simplify Merge by Distance operator

The old method to interpolate the position created a wrong merge. Now, always the secondary point is merged with the first one, except the last point.
August 7, 2019, 16:25 (GMT)
Merge branch 'master' into greasepencil-object
August 7, 2019, 15:01 (GMT)
GPencil: New Edit menu structure

Changes by @mendio
August 7, 2019, 11:11 (GMT)
GPencil: New operator merge by distance (WIP)

This operator joins points separated by a distance lower than factor. The point is moved to the middle location, except extremes that keep extreme location.
August 7, 2019, 10:16 (GMT)
Merge branch 'master' into greasepencil-object
August 7, 2019, 10:14 (GMT)
GPencil: Fix error after merge



August 6, 2019, 20:11 (GMT)
Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/editors/gpencil/annotate_paint.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/space_clip/clip_graph_draw.c
August 6, 2019, 17:44 (GMT)
GPencil: Revert wrong merge of LANPR branch

Due to an error, the code of LANPR branch was merged accidentally to the Grease Pencil branch.

This commit reverts all work to the last correct commit.

The command executed was: `git diff ff7482286319e7b462b98dc26909b47d9d661ec6 | patch -p1 -R`

Thanks to @dfelinto for fixing the error.
July 29, 2019, 14:46 (GMT)
Merge branch 'master' into greasepencil-object
July 29, 2019, 14:24 (GMT)
GPencil: Update stroke loop after merge using macro

During merge, the loop back to old style using for's and now it's using the macro.
July 29, 2019, 14:13 (GMT)
Merge branch 'master' into greasepencil-object
July 29, 2019, 11:56 (GMT)
GPencil: Merge by distance (WIP)

Initial implementation of merge by distance
GPencil: Fix duplicated CMake entry


GPencil: Add missing code for operator in previous commit

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021