blender.git
21 months agoMerge branch '28' into custom-manipulators custom-manipulators
Campbell Barton [Mon, 9 Oct 2017 09:49:27 +0000 (20:49 +1100)]
Merge branch '28' into custom-manipulators

21 months agoEevee: Fix bad defines for volumetric shadowing
Clément Foucault [Sun, 8 Oct 2017 16:23:45 +0000 (18:23 +0200)]
Eevee: Fix bad defines for volumetric shadowing

21 months agoGawain: Make common uniforms become builtins
Clément Foucault [Sun, 8 Oct 2017 13:49:25 +0000 (15:49 +0200)]
Gawain: Make common uniforms become builtins

This improves eevee's cache performance by 13% in my test.

21 months agoCleanup: style, duplicate includes
Campbell Barton [Sat, 7 Oct 2017 04:57:14 +0000 (15:57 +1100)]
Cleanup: style, duplicate includes

21 months agoCleanup: remove Py3.5 compatible code
Campbell Barton [Sat, 7 Oct 2017 04:14:36 +0000 (15:14 +1100)]
Cleanup: remove Py3.5 compatible code

21 months agoInitial fix for T53014: Cycles material preview no light
Dalai Felinto [Fri, 6 Oct 2017 21:54:27 +0000 (18:54 -0300)]
Initial fix for T53014: Cycles material preview no light

This was introduced on 9ad2c0b6154.

Although this still doesn't fix the issue, it updates the preview
system to use COLLECTION_DISABLED as intended.

What is missing now is for the flushing to work effectively.

21 months agoEevee: Shadows: Add Contact Shadows
Clément Foucault [Fri, 6 Oct 2017 21:43:36 +0000 (23:43 +0200)]
Eevee: Shadows: Add Contact Shadows

This add the possibility to add screen space raytraced shadows to fix light leaking cause by shadows maps.

Theses inherit of the same artifacts as other screenspace methods.

21 months agoEevee: Modify the raycast function to be more flexible.
Clément Foucault [Fri, 6 Oct 2017 21:38:31 +0000 (23:38 +0200)]
Eevee: Modify the raycast function to be more flexible.

Make quality a parameter, and modify the ray end to be premultiplied so that the raytrace is done on a range.

This is in order to add contact shadows.

21 months agoMerge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto [Fri, 6 Oct 2017 16:09:24 +0000 (13:09 -0300)]
Merge remote-tracking branch 'origin/master' into blender2.8

21 months agoCycles: Fix possible race condition when generating Beckmann table
Sergey Sharybin [Fri, 6 Oct 2017 16:06:15 +0000 (21:06 +0500)]
Cycles: Fix possible race condition when generating Beckmann table

Two issues here:

- Checking table size to be non-zero is not a proper way to go here. This is
  because we first resize the table and then fill it in. So it was possible that
  non-initialized table was used.

  Trickery with using temporary memory and then doing table.swap() might work,
  but we can not guarantee that table size will be set after the data pointer.

- Mutex guard was useless, because every thread was using own mutex. Need to
  make mutex guard static so all threads are using same mutex.

21 months agoFix crash when deleting workspace active in multiple windows
Julian Eisel [Fri, 6 Oct 2017 16:01:40 +0000 (18:01 +0200)]
Fix crash when deleting workspace active in multiple windows

21 months agoMerge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto [Fri, 6 Oct 2017 15:21:57 +0000 (12:21 -0300)]
Merge remote-tracking branch 'origin/master' into blender2.8

21 months agoCycles: Cleanup, indendation
Sergey Sharybin [Fri, 6 Oct 2017 14:33:59 +0000 (19:33 +0500)]
Cycles: Cleanup, indendation

21 months agoGawain: Reduce shader interface bucket size
Clément Foucault [Fri, 6 Oct 2017 14:25:38 +0000 (16:25 +0200)]
Gawain: Reduce shader interface bucket size

Tried 101 but it gives colisions.
I think 257 is enough now that we dont have thousands of uniforms.
This gives some noticeable performance improvement.
Could be refined further.

21 months agoGawain: Add UBOs to shader interface.
Clément Foucault [Fri, 6 Oct 2017 12:57:21 +0000 (14:57 +0200)]
Gawain: Add UBOs to shader interface.

21 months agoFix T53012: Shadow catcher creates artifacts on contact area
Sergey Sharybin [Fri, 6 Oct 2017 12:27:34 +0000 (17:27 +0500)]
Fix T53012: Shadow catcher creates artifacts on contact area

The issue was caused by light sample being evaluated to nan at some point.
This is root of the cause which is to be fixed, but is very hard to trace down
especially via ssh (the issue only happens on AVX2 release build). Will give it
a closer look when back to my AVX2 machine.

For until then this is a good check to have anyway, it corresponds to what's
happening in regular radiance sum.

21 months agoCycles: Cleanup, indentation and wrapping
Sergey Sharybin [Fri, 6 Oct 2017 11:54:37 +0000 (16:54 +0500)]
Cycles: Cleanup, indentation and wrapping

21 months agoMerge branch 'master' into blender28
Campbell Barton [Fri, 6 Oct 2017 10:25:33 +0000 (21:25 +1100)]
Merge branch 'master' into blender28

21 months agoCleanup: Math lib naming (use v3 suffix)
Campbell Barton [Fri, 6 Oct 2017 10:05:34 +0000 (21:05 +1100)]
Cleanup: Math lib naming (use v3 suffix)

21 months agoSequencer: Cleanup, use more BLI utilities where possible
Sergey Sharybin [Fri, 6 Oct 2017 10:00:22 +0000 (15:00 +0500)]
Sequencer: Cleanup, use more BLI utilities where possible

21 months agoSequencer: Use BLI math functions where possible
Sergey Sharybin [Fri, 6 Oct 2017 09:36:26 +0000 (14:36 +0500)]
Sequencer: Use BLI math functions where possible

21 months agoSequencer: Avoid re-calculation index offset multiple times
Sergey Sharybin [Fri, 6 Oct 2017 09:32:17 +0000 (14:32 +0500)]
Sequencer: Avoid re-calculation index offset multiple times

21 months agoSequencer: Use funciton instead of macr oto avoid argument re-evaluation
Sergey Sharybin [Fri, 6 Oct 2017 09:25:37 +0000 (14:25 +0500)]
Sequencer: Use funciton instead of macr oto avoid argument re-evaluation

21 months agoFix T52940: VSE Glow Effect Strip on transparent images has no blur
Sergey Sharybin [Fri, 6 Oct 2017 09:20:03 +0000 (14:20 +0500)]
Fix T52940: VSE Glow Effect Strip on transparent images has no blur

21 months agoError in falloff_angle range in last commit
Campbell Barton [Fri, 6 Oct 2017 09:20:15 +0000 (20:20 +1100)]
Error in falloff_angle range in last commit

21 months agoVertex Paint: move normal falloff into the brush
Campbell Barton [Fri, 6 Oct 2017 09:11:17 +0000 (20:11 +1100)]
Vertex Paint: move normal falloff into the brush

All related settings are already in the brush,
so it's inconvenient to switch panels to change this one option.

21 months agoVertex Paint: use view normal w/ 2D falloff
Campbell Barton [Fri, 6 Oct 2017 08:10:33 +0000 (19:10 +1100)]
Vertex Paint: use view normal w/ 2D falloff

When projecting to the view, cull faces pointing
away from the view normal.

21 months agoVertex Paint: use brush front-face setting
Campbell Barton [Fri, 6 Oct 2017 07:57:37 +0000 (18:57 +1100)]
Vertex Paint: use brush front-face setting

Follow sculpt mode more closely by using the brush front-face option.

21 months agoSculpt: use tube falloff when calculating normals
Campbell Barton [Fri, 6 Oct 2017 07:29:54 +0000 (18:29 +1100)]
Sculpt: use tube falloff when calculating normals

Also apply 2D clamping for other tools when the option is set.

21 months agoSculpt: clamp normal to plane w/ projected falloff
Campbell Barton [Fri, 6 Oct 2017 06:38:56 +0000 (17:38 +1100)]
Sculpt: clamp normal to plane w/ projected falloff

Allows for editing outlines w/o pushing geometry towards/away from
the view.

21 months agoFix ruler access from search pop-up
Campbell Barton [Fri, 6 Oct 2017 06:12:25 +0000 (17:12 +1100)]
Fix ruler access from search pop-up

D2831 by @1xundoredo

21 months agoCleanup: style
Campbell Barton [Fri, 6 Oct 2017 05:56:41 +0000 (16:56 +1100)]
Cleanup: style

21 months agoGawain: Simplify / optimize the shader interface.
Clément Foucault [Thu, 5 Oct 2017 16:26:50 +0000 (18:26 +0200)]
Gawain: Simplify / optimize the shader interface.

This changes quite a few things:
- Drops the allocation of inputs as a chunk.
- Merge the linked list system into the Gwn_ShaderInput.
- Put name buffer into another memory block, easily resizable.
- Use offset instead of char* to direct to input name.
- Add only requested uniforms dynamicaly to the Shader Interface.

This drops some minor optimisation and use a bit more memory for small shaders (which are fixed count).
But this saves a lot of memory when using UBOs because the names and the Gwn_ShaderInput were alloc'ed for every UBO variable.
This also reduce the Shader Interface initial generation.
The lookup time is left unchanged.

21 months agoRevert "Gawain: Optimize out extra level on top of ShaderInput"
Clément Foucault [Thu, 5 Oct 2017 23:50:16 +0000 (01:50 +0200)]
Revert "Gawain: Optimize out extra level on top of ShaderInput"

This reverts commit 5514d2df1c6d9f2f108336e46b0db14316610d24.

21 months agoFix T52514: don't clear filename when dropping directory path in file browser.
Brecht Van Lommel [Thu, 5 Oct 2017 22:18:57 +0000 (00:18 +0200)]
Fix T52514: don't clear filename when dropping directory path in file browser.

21 months agoFix T52998: disabled menu entries responding to key shortcuts.
Brecht Van Lommel [Thu, 5 Oct 2017 15:46:22 +0000 (17:46 +0200)]
Fix T52998: disabled menu entries responding to key shortcuts.

21 months agoFix T53002: Batch-Generate Previews generate empty or none image for large objects.
Bastien Montagne [Thu, 5 Oct 2017 16:12:10 +0000 (18:12 +0200)]
Fix T53002: Batch-Generate Previews generate empty or none image for large objects.

Camera clipping was left to default values, which won't work well for
very large (or small) objects. Now recompute valid clipping start/end
based on boundingbox of rendered data, and final location of camera.

21 months agoFix T53001: more workarounds for crash in AMD compiler with recent drivers.
Brecht Van Lommel [Thu, 5 Oct 2017 14:41:41 +0000 (16:41 +0200)]
Fix T53001: more workarounds for crash in AMD compiler with recent drivers.

21 months agoCode refactor: split displace/background into separate kernels, remove luma.
Brecht Van Lommel [Thu, 5 Oct 2017 13:17:09 +0000 (15:17 +0200)]
Code refactor: split displace/background into separate kernels, remove luma.

21 months agoSculpt Mode: 2D falloff option
Campbell Barton [Thu, 5 Oct 2017 13:18:11 +0000 (00:18 +1100)]
Sculpt Mode: 2D falloff option

This makes brush influence into a tube instead of a sphere.
It can be used along the outline of a mesh to adjust it's silhouette.

Note that all this takes advantage of changes from vertex paint,
from testing this seems useful so exposing from the brush options.

21 months agoGawain: Optimize out extra level on top of ShaderInput
Sergey Sharybin [Thu, 5 Oct 2017 13:38:23 +0000 (18:38 +0500)]
Gawain: Optimize out extra level on top of ShaderInput

This is an internal structure, and we don't put it to a list for anything else
that hash collision resolution. No need to have dedicated entry here, saves us
from extra allocation and pointer dereference.

21 months agoDraw manager: Avoid unneeded memory malloc/free when attempting to create missing...
Sergey Sharybin [Thu, 5 Oct 2017 12:16:37 +0000 (17:16 +0500)]
Draw manager: Avoid unneeded memory malloc/free when attempting to create missing uniform

21 months agoGawain: Make builtin uniform lookup to be O(1)
Sergey Sharybin [Thu, 5 Oct 2017 11:19:14 +0000 (16:19 +0500)]
Gawain: Make builtin uniform lookup to be O(1)

21 months agoGawain: Lookup uniforms and attributes from buckets
Sergey Sharybin [Wed, 4 Oct 2017 12:36:52 +0000 (17:36 +0500)]
Gawain: Lookup uniforms and attributes from buckets

This way we reduce number of loops from look-over-all-inputs to
loop-over-collision, which is expected to be much less CPU ticks.

There is still possible optimization: use memory pool of some sort
to manage memory needed for hash entries, but that will only speedup
shader interface construction / deconstruction time.

There are also some trickery happening to speed up process even more
in the case there is no hash collisions detected when constructing
shader interface.

21 months agoGawain: Force hashing function to be inlined
Sergey Sharybin [Wed, 4 Oct 2017 11:53:02 +0000 (16:53 +0500)]
Gawain: Force hashing function to be inlined

Makes sure we don't waste CPU ticks on function call in such a time critical
area.

21 months agoVertex Paint: apply when cursor isn't over faces
Campbell Barton [Thu, 5 Oct 2017 10:16:25 +0000 (21:16 +1100)]
Vertex Paint: apply when cursor isn't over faces

This behavior makes more sense for sculpt, less so for painting.
Restores non PBVH behavior, adding `BKE_pbvh_find_nearest_to_ray` -
similar to ray-cast except it finds the closest point on the surface.

21 months agoCleanup: rename dist -> depth
Campbell Barton [Thu, 5 Oct 2017 10:06:04 +0000 (21:06 +1100)]
Cleanup: rename dist -> depth

Prepare to add code that stores distance to the ray, avoid confusion.

21 months agoCleanup: remove unused struct member
Campbell Barton [Thu, 5 Oct 2017 06:52:05 +0000 (17:52 +1100)]
Cleanup: remove unused struct member

Merged with soc-2016-pbvh-painting, no longer needed.

21 months agoDisable cursor drawing while navigating
Campbell Barton [Thu, 5 Oct 2017 06:35:46 +0000 (17:35 +1100)]
Disable cursor drawing while navigating

Was performing ray-casts in sculpt mode on every update.

21 months agoFix sculpt secondary color missing some brushes
Campbell Barton [Thu, 5 Oct 2017 01:57:24 +0000 (12:57 +1100)]
Fix sculpt secondary color missing some brushes

D2841 by @uvwxyz w/ edits

21 months agoCleanup: use bool for brush checks
Campbell Barton [Thu, 5 Oct 2017 01:51:36 +0000 (12:51 +1100)]
Cleanup: use bool for brush checks

21 months agoFix brush reset (missing notifier)
Campbell Barton [Thu, 5 Oct 2017 01:32:24 +0000 (12:32 +1100)]
Fix brush reset (missing notifier)

D2843 by @uvwxyz

21 months agoCMake: use restrict w/ gcc, not clang
Campbell Barton [Thu, 5 Oct 2017 01:08:17 +0000 (12:08 +1100)]
CMake: use restrict w/ gcc, not clang

21 months agoPyAPI: fast keyword parsing for bpy modules
Campbell Barton [Wed, 4 Oct 2017 23:52:18 +0000 (10:52 +1100)]
PyAPI: fast keyword parsing for bpy modules

No functional changes.

21 months agoCMake: add -Wrestrict for GCC
Campbell Barton [Wed, 4 Oct 2017 23:50:02 +0000 (10:50 +1100)]
CMake: add -Wrestrict for GCC

21 months agoFix passing the same argument twice to BLI_strncpy
Campbell Barton [Wed, 4 Oct 2017 23:47:08 +0000 (10:47 +1100)]
Fix passing the same argument twice to BLI_strncpy

21 months agoFix setting the operator name in Py operator API
Campbell Barton [Wed, 4 Oct 2017 23:46:26 +0000 (10:46 +1100)]
Fix setting the operator name in Py operator API

21 months agoFix incorrect CUDA remaining time estimate after previous commit.
Brecht Van Lommel [Wed, 4 Oct 2017 21:25:51 +0000 (23:25 +0200)]
Fix incorrect CUDA remaining time estimate after previous commit.

21 months agoCycles: CUDA faster rendering of small tiles, using multiple samples like OpenCL.
Brecht Van Lommel [Tue, 26 Sep 2017 23:38:19 +0000 (01:38 +0200)]
Cycles: CUDA faster rendering of small tiles, using multiple samples like OpenCL.

The work size is still very conservative, and this doesn't help for progressive
refine. For that we will need to render multiple tiles at the same time. But this
should already help for denoising renders that require too much memory with big
tiles, and just generally soften the performance dropoff with small tiles.

Differential Revision: https://developer.blender.org/D2856

21 months agoEevee : Fix T52991
Clément Foucault [Wed, 4 Oct 2017 19:31:25 +0000 (21:31 +0200)]
Eevee : Fix T52991

21 months agoFix use of uninitialized memory in Cycles normal baking.
Brecht Van Lommel [Tue, 3 Oct 2017 22:28:32 +0000 (00:28 +0200)]
Fix use of uninitialized memory in Cycles normal baking.

21 months agoCode refactor: zero render buffers outside of kernel.
Brecht Van Lommel [Wed, 27 Sep 2017 01:53:03 +0000 (03:53 +0200)]
Code refactor: zero render buffers outside of kernel.

This was originally done with the first sample in the kernel for better
performance, but it doesn't work anymore with atomics. Any benefit was
very minor anyway, too small to measure it seems.

21 months agoCode refactor: use split variance calculation for mega kernels too.
Brecht Van Lommel [Tue, 26 Sep 2017 23:03:50 +0000 (01:03 +0200)]
Code refactor: use split variance calculation for mega kernels too.

There is no significant difference in denoised benchmark scenes and
denoising ctests, so might as well make it all consistent.

21 months agoCode refactor: remove rng_state buffer and compute hash on the fly.
Brecht Van Lommel [Tue, 26 Sep 2017 22:39:53 +0000 (00:39 +0200)]
Code refactor: remove rng_state buffer and compute hash on the fly.

A little faster on some benchmark scenes, a little slower on others, seems
about performance neutral on average and saves a little memory.

21 months agoCode refactor: add WorkTile struct for passing work to kernel.
Brecht Van Lommel [Tue, 26 Sep 2017 21:42:36 +0000 (23:42 +0200)]
Code refactor: add WorkTile struct for passing work to kernel.

This makes sharing some code between mega/split in following commits a bit
easier, and also paves the way for rendering multiple tiles later.

21 months agoFix T52645, T52645: AMD OpenCL compiler crash with recent drivers.
Brecht Van Lommel [Wed, 4 Oct 2017 18:45:20 +0000 (20:45 +0200)]
Fix T52645, T52645: AMD OpenCL compiler crash with recent drivers.

Work around the bug by reshuffling code.

21 months agoinstalldeps: Fix building numpy with newer py system...
Bastien Montagne [Wed, 4 Oct 2017 18:15:35 +0000 (20:15 +0200)]
installdeps: Fix building numpy with newer py system...

Many thanks to Jens Verwiebe for investigating and finding this fix.

21 months agoFix T42489 and T52936: Loading blend with minimized window results in crash or empty...
Ray Molenkamp [Wed, 4 Oct 2017 17:44:22 +0000 (11:44 -0600)]
Fix T42489 and T52936: Loading blend with minimized window results in crash or empty screen on windows.

Reviewed By: @brecht , @sergey

Differential Revision: http://developer.blender.org/D2866

21 months agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 4 Oct 2017 17:18:05 +0000 (22:18 +0500)]
Merge branch 'master' into blender2.8

21 months agoFix error copying smoke modifier uv layer
Campbell Barton [Wed, 4 Oct 2017 15:44:02 +0000 (02:44 +1100)]
Fix error copying smoke modifier uv layer

21 months agoTssst, we use USA english, not Oxford one... :P
Bastien Montagne [Wed, 4 Oct 2017 10:42:33 +0000 (12:42 +0200)]
Tssst, we use USA english, not Oxford one... :P

21 months agoFix i18n messages extraction script, and a few more UI messages...
Bastien Montagne [Wed, 4 Oct 2017 10:38:40 +0000 (12:38 +0200)]
Fix i18n messages extraction script, and a few more UI messages...

21 months agoFix T52982: Join operator with context override crashes Blender 2.79
Sergey Sharybin [Wed, 4 Oct 2017 09:59:44 +0000 (14:59 +0500)]
Fix T52982: Join operator with context override crashes Blender 2.79

21 months agoFix T52923: Circle diameter is in fact radius
Campbell Barton [Wed, 4 Oct 2017 07:01:53 +0000 (18:01 +1100)]
Fix T52923: Circle diameter is in fact radius

21 months agoCleanup: redundant casts
Campbell Barton [Wed, 4 Oct 2017 05:44:45 +0000 (16:44 +1100)]
Cleanup: redundant casts

21 months agoDocs: remove outdated PyAPI guide
Campbell Barton [Wed, 4 Oct 2017 04:56:27 +0000 (15:56 +1100)]
Docs: remove outdated PyAPI guide

21 months agoPyAPI: fast keyword parsing for __import__
Campbell Barton [Wed, 4 Oct 2017 04:54:41 +0000 (15:54 +1100)]
PyAPI: fast keyword parsing for __import__

No functional changes.

21 months agoPyAPI: fast keyword parsing for bpy.props
Campbell Barton [Wed, 4 Oct 2017 04:13:52 +0000 (15:13 +1100)]
PyAPI: fast keyword parsing for bpy.props

No functional changes.

21 months agoSome UI/messages fixes.
Bastien Montagne [Tue, 3 Oct 2017 19:32:31 +0000 (21:32 +0200)]
Some UI/messages fixes.

21 months agoEevee: Some changes to the Render / Render layers settings panel.
Clément Foucault [Tue, 3 Oct 2017 16:30:36 +0000 (18:30 +0200)]
Eevee: Some changes to the Render / Render layers settings panel.

- Separate the Post Processes settings into sub panel.
- Rename "Viewport Anti-Aliasing" to sampling & super-sampling as it also reduce the noise of other effects.
- Remove Temporal Anti-Aliasing toggle and make it always active unless the number of samples is 1.

21 months agoObject Mode : Fix probe paralax display.
Clément Foucault [Tue, 3 Oct 2017 14:24:28 +0000 (16:24 +0200)]
Object Mode : Fix probe paralax display.

21 months agoDRW: Fix Feedbackloop warning.
Clément Foucault [Tue, 3 Oct 2017 13:33:15 +0000 (15:33 +0200)]
DRW: Fix Feedbackloop warning.

21 months agoCMake: avoid naming collision
Campbell Barton [Tue, 3 Oct 2017 14:35:24 +0000 (01:35 +1100)]
CMake: avoid naming collision

21 months agoPython: bump minimum version to 3.6
Campbell Barton [Tue, 3 Oct 2017 12:50:34 +0000 (23:50 +1100)]
Python: bump minimum version to 3.6

21 months agoCleanup: remove unused vpaint projection handle
Campbell Barton [Tue, 3 Oct 2017 12:43:30 +0000 (23:43 +1100)]
Cleanup: remove unused vpaint projection handle

21 months agoWeight Paint: blend smear tool
Campbell Barton [Tue, 3 Oct 2017 12:35:30 +0000 (23:35 +1100)]
Weight Paint: blend smear tool

21 months agoVertex Paint: fix feedback loop w/ smear tool
Campbell Barton [Tue, 3 Oct 2017 12:04:22 +0000 (23:04 +1100)]
Vertex Paint: fix feedback loop w/ smear tool

Was reading and writing from same array,
this also makes smear thread-safe.

21 months agoFix bplayer (c)
Bastien Montagne [Tue, 3 Oct 2017 10:31:36 +0000 (12:31 +0200)]
Fix bplayer (c)

21 months agoFix T52981: 2D Curve shapes do not render untill extruded
Sergey Sharybin [Tue, 3 Oct 2017 10:28:57 +0000 (15:28 +0500)]
Fix T52981: 2D Curve shapes do not render untill extruded

Regression since 9298c53.

21 months agoChange weigth paint accumulate mechanics to fix problems with mirroring.
Alexander Gavrilov [Tue, 3 Oct 2017 09:28:07 +0000 (12:28 +0300)]
Change weigth paint accumulate mechanics to fix problems with mirroring.

Restoring weights is problematic when the stroke overlaps its mirror.
It's better to simply compute the new weight based on the saved data
rather than restoring things, and check that the change is monotonic.

This way is also closer to how things worked before the merge.

21 months agoVertex Paint: smear got wrong last-location
Campbell Barton [Tue, 3 Oct 2017 09:19:59 +0000 (20:19 +1100)]
Vertex Paint: smear got wrong last-location

21 months agoError in last commit, weight must be set for non-accumulate
Campbell Barton [Tue, 3 Oct 2017 08:24:02 +0000 (19:24 +1100)]
Error in last commit, weight must be set for non-accumulate

21 months agoVertex Paint: remove accumulate (soc-2017-vertex_paint)
Campbell Barton [Tue, 3 Oct 2017 07:50:34 +0000 (18:50 +1100)]
Vertex Paint: remove accumulate (soc-2017-vertex_paint)

This secondary accumulation option accumulated brush falloff.
The same option in image painting accumulates color
as vertex paiht 'Spray' does.

Giving this option different behavior for vertex paint seems strange.
Also this is basically increasing falloff over time.

Remove the new code, expose existing 'Spray' as 'Accumulate'
to match other paint modes.

21 months agoMerge branch 'master' into blender2.8
Sergey Sharybin [Tue, 3 Oct 2017 07:59:06 +0000 (12:59 +0500)]
Merge branch 'master' into blender2.8

Notes:

- Changes in paint_vertex.c were simple to merge, mainly related on passing
  evaluation context.

- Conflicts in EditDM and drawmesh.c are solved using code from blender2.8
  branch. Those areas are deprecated and not to be used in final release.

  However, it's possible that some reference code from master is lost, so
  keep attention when adding alpha support for vertex painting.

21 months agoWeight Paint: don't set weight w/ average brush
Campbell Barton [Tue, 3 Oct 2017 07:43:18 +0000 (18:43 +1100)]
Weight Paint: don't set weight w/ average brush

Also use 'const' for brush.

21 months agoCorrect int division in last commit
Campbell Barton [Tue, 3 Oct 2017 06:36:55 +0000 (17:36 +1100)]
Correct int division in last commit

21 months agoWeight Paint: add some color blending modes
Campbell Barton [Tue, 3 Oct 2017 06:24:29 +0000 (17:24 +1100)]
Weight Paint: add some color blending modes

While these mostly make sense for color,
there is no harm in supporting.

21 months agoEevee : Fix grid black fill.
Clément Foucault [Mon, 2 Oct 2017 20:17:20 +0000 (22:17 +0200)]
Eevee : Fix grid black fill.

21 months agoGawain : Add workaround to fix bad sync of the program_in_use flag.
Clément Foucault [Mon, 2 Oct 2017 20:16:50 +0000 (22:16 +0200)]
Gawain : Add workaround to fix bad sync of the program_in_use flag.

21 months agoEevee : Fix ghosting from probe data when toggling "only render".
Clément Foucault [Mon, 2 Oct 2017 18:02:21 +0000 (20:02 +0200)]
Eevee : Fix ghosting from probe data when toggling "only render".