Blender Git Loki

Cleanup space line

Merge branch 'blender2.8' into greasepencil-object

Fix errors after merge

Merge branch 'blender2.8' into greasepencil-object

Fix Lattice memory leak

The loop need to free memory to avoid memory leak

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c

Revert "GSOC vertex-paint changes for experimental build"

This reverts commit 40aeab9bc0ada718be5797dfaa340455d662f733.

GSOC vertex-paint changes for experimental build
Squashed commit of the following:

commit be09594bf962cf24b97c3b616b91d46c42f38a13
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Wed Aug 9 20:22:22 2017 +0530

curve falloff works properly with alpha now

commit a197b716cd2a29ad9e789d1ccb88f65bc1715b23
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Tue Aug 8 21:56:56 2017 +0530

curve fall of works properly now

commit 203ec4c69b4bbd08db6ad98945bb26fcde83643f
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sun Aug 6 19:17:05 2017 +0530

fixed texture painting brush issue

commit 9e277cd5e1f36c9d3fd156c0a4ac63bdf3cb3c6e
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Aug 3 17:21:20 2017 +0530

vertex selection now works fine with occluded mode

commit 408d26240623b44da0d8532389dc23b07de7e37e
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Wed Aug 2 15:55:32 2017 +0530

new color layor set to default rather tha copying previos one

commit 5f20911a44884c4ab54d846d08df8c36da8ed36d
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Wed Aug 2 12:40:00 2017 +0530

increase the color layer to 64

commit fddd39d718a7cf5552e95be02e34a6ea41b0e9fe
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Wed Jul 26 21:51:45 2017 +0530

subsurface modier changed to consider alpha display in vpaint

commit 90e0c31c72d351d10044bc3579c23497b2fd51ec
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jul 22 15:41:36 2017 +0530

added the color lock in vertex paint

commit 076b351b2c805d153c242c58fdf61aaffa9338e4
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jul 20 19:46:12 2017 +0530

now alpha blends same as the rgb colors

commit 4ed7bc28930fc3765be57737936bb4a15f0b9840
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Tue Jul 18 23:41:56 2017 +0530

modified the ply importer to take alpha in vpaint

commit b36f866799f843156e4f1deb86e3a6f1c07f9989
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Tue Jul 18 13:21:22 2017 +0530

removed the traces of printf() which was slowing the painting

commit 986018165b4b32ee382d16ad3e1af5399d76acb7
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Fri Jul 14 14:09:45 2017 +0530

now alpha effect can be seen in 3d view in vpaint

commit fa889d2ad9321213b6a9519830fef46c070b1ab5
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jul 13 10:31:50 2017 +0530

added alpha support to the collada exporter for vpaint

commit 5acf2e1a95b75da0eccbb94e1fc7e18074341b0c
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Wed Jul 12 12:34:17 2017 +0530

added the addons to script folder, alpha supprt for fbx and oly

commit 97e46b5e1450bdb18b96a61a98fcf7248cd2d9ce
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sun Jul 9 13:53:15 2017 +0530

added the alpha along with rgb in .ply exporter in vpaint

commit e486461f23d1eacf009a097c890181304428edee
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jul 8 00:39:24 2017 +0530

added the alpha channel in vpaint a slider and change in ply exporter

commit db3441c8c5c6526162bc850d3514c86e3b27ebdd
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jul 1 12:29:50 2017 +0530

finalised 1 = white and 0 = black for weight to vertex converter

commit bf6338c48184e528880e48043964ae7b4189ae57
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Fri Jun 30 16:25:08 2017 +0530

added the weight to paint converter as option in paint in verte xpainting and weight in weight painting

commit 1a77b5fe7b68bc17cdbc0ff290018b2409fd211d
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jun 29 14:34:12 2017 +0530

removed the redundant code

commit 28e4e9b0247e001d10e90f5ed5f3be0866e6e9c6
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jun 29 14:03:51 2017 +0530

added weight to vertex paint converter

commit 88936370487d2ca83dfd80bd49f931734aa0cf1c
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Tue Jun 27 10:16:33 2017 +0530

fixed a bug for vertex mask selection

commit 444ad728cd4df291bd19b814f390f6977ee3ddb6
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jun 24 00:33:33 2017 +0530

added non-occluded mode for the weight painting

commit 39a2294d38b0e740dbef47b423b78141d5a6d5a0
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jun 22 15:55:08 2017 +0530

added the non-occluded mode

commit 72533b087acc69ae1f4fa6ec750ca50979ae278f
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Tue Jun 13 14:04:55 2017 +0530

added vertex mask feature

commit b7532023812b9f3855f74a9da6f3b8986605f3a3
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sun Jun 11 18:32:04 2017 +0530

added accumulate option

commit a03922f02347a0d16a6580f38fdb7dc76b887f53
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jun 10 14:13:31 2017 +0530

corrected typo mistake in difference blend mode

commit 3138c32878e5b75fc92a79ef331f046b87e2dd8b
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sun Jun 4 22:57:59 2017 +0530

added softlight,exclusion,luminocity,saturtion,hue blend modes

commit b72aff483fbe6ce84dab9b5a23f6ca6f0c96988c
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Sat Jun 3 10:21:09 2017 +0530

added Color Dodge, Difference, Screen, Hardlight, Overlay blend modes

commit 29645a58384273512560c6b27eb1c979ea514682
Author: Darshan Kadu <darsh7807@gmail.com>
Date: Thu Jun 1 14:04:06 2017 +0530

applied patch D2150.id8618.diff and fixed versioning_270.c

Merge branch 'master' into experimental-build

Tint modifier change alpha if value > 1

The alpha only change if the value of the factor is greater than 1. Whith a value of 2, get a full tint with full opacity.

Add new factor to define pixel scale

This new parameter allows to define the factor to convert stroke thickness to pixel scale.

By default the factor was set to 40 that gets a good result.

Merge branch 'master' into id_override_static

Merge branch 'id_copy_refactor' into id_override_static

Merge branch 'master' into id_copy_refactor

Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c

Added Multithreading to the intersection tests. No real performance improvement. Maybe multithreading needs to be relative to the rings, not to the nodes (double nested both?).

Cleanup: Remove compiler warning

Fix Tint error when factor is 1

When factor is 1, must override the alpha of the original color

Fix opacity modifier error with values greater than 1.0

If the opacity is set to >1 values, the alpha must be overrided.

Calculating intersecting edges in the silhouette. (Big performance hit)

New Dissolve modes

Now is possible dissolve between selected points or unselected points.

This is used to simplify a stroke.