Blender Git Commit Log

Merge branch 'master' into blender2.8

Use custom SWAP macro for swapping userdef data

Avoids complicating the common case

Revert "BLI_utildefines: Support SWAP macro with two args"

This reverts commit d749320e3b10161430bc4cb7dd92edb63712bf8c.

It's possible the container struct is larger,
we could do sizeof checks that falls back to memmove
but rather avoid complicating things.

UI: Add buttons at bottom bar

Add Only Render and Lock Camera View options to bottom toolbar because use the options in panels break the drawing workflow and use a lot of space in the drawing area.

Fix error after merge

Eevee : Fix error with volumetrics.

Merge branch 'blender2.8' into greasepencil-object

Fix doversion crash with 2.8 files that had freestyle 2.8

Crash introduced on: 3a95bdfc65d883e7db006fd
We can't decrease user count of freestyle linestyle IDs before linking.

Moving doversion for after linking.
And for the records we are simply removing the freestyle data altogether.
This is only for files created with 2.8, so it should be fine.

Merge branch 'master' into blender2.8

BLI_utildefines: Support SWAP macro with two args

Fix T53274: Saving template prefs overwrites default prefs

Merge branch 'blender2.8' into greasepencil-object

Fix multi layer/multi pass render

But introduced on the SceneRenderLayer > RenderLayer commit:
3a95bdfc65d883e7db006f

Reported by Sergey Sharybin (over irc).

Merge branch 'master' into blender2.8

Depsgraph: Remove debug only code

Fixup for last commit: flipped logic for disabling SceneLayer render

Layers doversion: Don't set the Viewport created layer as renderable

Fix SceneRenderLayer memory leak for files created with 2.8

SceneRenderLayer Removal/Refactor

This patch moves all the functionality previously in SceneRenderLayer to SceneLayer.
If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer.

Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get
rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished.

This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail.

This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion).

Following next is the individual note of the individual parts that were committed.

Note 1: It is up to Cycles to still get rid of exclude_layer internally.
Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and

(1) Remove the override as it is
(2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE

Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED.

Note 3: Cycles still need to implement the per-object holdout
(similar to how we do shadow catcher).

Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still
using lay, e.g., in shi->lay.

Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit.

Reviewers: sergey, campbellbarton, brecht

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

SceneRenderLayer > SceneLayer: Convert Lay

There are parts of the old (Blender Internal) rendering pipeline that is still
using lay, e.g., in shi->lay.

Honestly it will be easier to purge the entire Blender Internal code away instead
of taking things from it bit by bit.