[Bf-blender-cvs] [0c945288299] blender2.8: Cleanup: naming in MOD_utils.

Commit: 0c945288299da96decbe20df9c46dfbcc7f3891f Author: Bastien Montagne Date: Fri Jun 29 19:02:19 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB0c945288299da96decbe20df9c46dfbcc7f3891f Cleanup: naming in MOD_utils.

[Bf-blender-cvs] [3bc21bc5f79] blender2.8: Cleanup: Moar DM busting, mostly cleaning up MOD_utils.

Commit: 3bc21bc5f79aa21a63c6d545327b8e24eb9eb975 Author: Bastien Montagne Date: Fri Jun 29 18:58:13 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB3bc21bc5f79aa21a63c6d545327b8e24eb9eb975 Cleanup: Moar DM busting, mostly cleaning up MOD_utils.

[Bf-blender-cvs] [cb144fe5ce1] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Commit: cb144fe5ce1cf6d9389a835839f95718215dc49f Author: Antonio Vazquez Date: Fri Jun 29 20:41:57 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rBcb144fe5ce1cf6d9389a835839f95718215dc49f Merge branch 'blender2.8' into greasepencil-object

[Bf-blender-cvs] [a9ab9f46f9c] temp-greasepencil-vfx: Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Commit: a9ab9f46f9c36f94437833ffbe46065da2534c3d Author: Antonio Vazquez Date: Fri Jun 29 20:42:24 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rBa9ab9f46f9c36f94437833ffbe46065da2534c3d Merge branch 'greasepencil-object' into temp-greasepencil-vfx

[Bf-blender-cvs] [728e92422ef] master: Fix T54524: keyframe and driver colors not showing in shape key list.

Commit: 728e92422ef3ec97a72db37572146498280e730e Author: Brecht Van Lommel Date: Fri Jun 29 21:13:35 2018 +0200 Branches: master https://developer.blender.org/rB728e92422ef3ec97a72db37572146498280e730e Fix T54524: keyframe and driver colors not showing in shape key list. This reverts commit

[Bf-blender-cvs] [ac2e10d47b3] blender2.8: Fix memory leak when using scroll-bars

Commit: ac2e10d47b38e944efab66781ed0a4f4d4c41588 Author: Severin Date: Fri Jun 29 20:54:44 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBac2e10d47b38e944efab66781ed0a4f4d4c41588 Fix memory leak when using scroll-bars

[Bf-blender-cvs] [48ad67ef820] blender2.8: Cleanup: Add/use function to get area width/height from area vertices

Commit: 48ad67ef8201f8fcd5efdf748c5fea86e2c61d7d Author: Severin Date: Fri Jun 29 21:22:27 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB48ad67ef8201f8fcd5efdf748c5fea86e2c61d7d Cleanup: Add/use function to get area width/height from area vertices This used to be rather

[Bf-blender-cvs] [1f1c2d8ce87] blender2.8: Cleanup: Move area geometry management into an own file

Commit: 1f1c2d8ce8744c84d0c663885ef5da04c301fefc Author: Severin Date: Sat Jun 30 01:56:07 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB1f1c2d8ce8744c84d0c663885ef5da04c301fefc Cleanup: Move area geometry management into an own file Area geometry management is quite complex

[Bf-blender-cvs] [a55b00b53ba] blender2.8: Fix a number of small errors in area coordinate handling

Commit: a55b00b53baf2e202b88cbea0f61a232ff9843d3 Author: Severin Date: Sat Jun 30 00:42:19 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBa55b00b53baf2e202b88cbea0f61a232ff9843d3 Fix a number of small errors in area coordinate handling For example collapsing the lower part of

[Bf-blender-cvs] [9b6aed845a2] blender2.8: Cleanup: Remove unused argument in recursive function

Commit: 9b6aed845a29cb0f8f63ede70bfa398b2849adeb Author: Severin Date: Fri Jun 29 20:34:00 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB9b6aed845a29cb0f8f63ede70bfa398b2849adeb Cleanup: Remove unused argument in recursive function

[Bf-blender-cvs] [af36dd4664d] master: Cleanup: trailing newlines

Commit: af36dd4664ddf35c7ad99f05f9878ce1acf787bd Author: Campbell Barton Date: Fri Jun 29 08:02:49 2018 +0200 Branches: master https://developer.blender.org/rBaf36dd4664ddf35c7ad99f05f9878ce1acf787bd Cleanup: trailing newlines ===

[Bf-blender-cvs] [d34b0faa65f] blender2.8: Workbench: Removed MaterialData UBO

Commit: d34b0faa65f9585d7013a120523e9b87a22c60bd Author: Jeroen Bakker Date: Fri Jun 29 08:25:23 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBd34b0faa65f9585d7013a120523e9b87a22c60bd Workbench: Removed MaterialData UBO Most of the times the materials differ due to the

[Bf-blender-cvs] [899d100dd44] blender2.8: Workbench: Use less GPU memory

Commit: 899d100dd44c26ec8633f6d1b5540c11de9226b0 Author: Jeroen Bakker Date: Fri Jun 29 08:42:56 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB899d100dd44c26ec8633f6d1b5540c11de9226b0 Workbench: Use less GPU memory When AA was enabled a new buffer was created. As the

[Bf-blender-cvs] [3edc6ece775] temp-keymap-save: Write all non modal keymaps

Commit: 3edc6ece775cb265f1697b7b8d6d7bf345b6b862 Author: Campbell Barton Date: Fri Jun 29 08:53:27 2018 +0200 Branches: temp-keymap-save https://developer.blender.org/rB3edc6ece775cb265f1697b7b8d6d7bf345b6b862 Write all non modal keymaps

[Bf-blender-cvs] [33254875300] blender2.8: Keymap: 2.7x macos-only additions

Commit: 332548753008f941d920c8a9ee1079dbf1895d37 Author: Campbell Barton Date: Fri Jun 29 09:17:13 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB332548753008f941d920c8a9ee1079dbf1895d37 Keymap: 2.7x macos-only additions

[Bf-blender-cvs] [f44c9b0c93e] blender2.8: Keymap: add 2.7x keymap

Commit: f44c9b0c93e0ce855e7a3868b74d686f488141ec Author: Campbell Barton Date: Fri Jun 29 08:38:02 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBf44c9b0c93e0ce855e7a3868b74d686f488141ec Keymap: add 2.7x keymap This is the keymap from 929c78e33c06f55af4a3d98240959c4afcf9f39c

[Bf-blender-cvs] [b3727668168] master: Cleanup: trailing newlines

Commit: b3727668168075137f2ded11d7a7821548e4451d Author: Campbell Barton Date: Fri Jun 29 09:23:51 2018 +0200 Branches: master https://developer.blender.org/rBb3727668168075137f2ded11d7a7821548e4451d Cleanup: trailing newlines ===

[Bf-blender-cvs] [9bd0c63382b] blender2.8: Merge branch 'master' into blender2.8

Commit: 9bd0c63382bf226c271c40d5a5967c22c75718ea Author: Campbell Barton Date: Fri Jun 29 08:05:38 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB9bd0c63382bf226c271c40d5a5967c22c75718ea Merge branch 'master' into blender2.8

[Bf-blender-cvs] [18d87e79e92] blender2.8: Merge branch 'master' into blender2.8

Commit: 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 Author: Campbell Barton Date: Fri Jun 29 09:25:40 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 Merge branch 'master' into blender2.8

[Bf-blender-cvs] [f88f2b73c0e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Commit: f88f2b73c0ed01f3447e834780c443ec6940d356 Author: Antonio Vazquez Date: Fri Jun 29 09:55:11 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rBf88f2b73c0ed01f3447e834780c443ec6940d356 Merge branch 'blender2.8' into greasepencil-object

[Bf-blender-cvs] [15ebe30bc5b] blender2.8: Workbench: remove runtime warnings

Commit: 15ebe30bc5bdb9d515c8a8a478db6c7770ff0fb1 Author: Jeroen Bakker Date: Fri Jun 29 09:59:37 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB15ebe30bc5bdb9d515c8a8a478db6c7770ff0fb1 Workbench: remove runtime warnings Added feature check when uploading material uniforms

[Bf-blender-cvs] [0c1c619681f] greasepencil-object: Fix draw back error due z-depth precission

Commit: 0c1c619681fd12d4a35a3f2ec8bbc36b40ddf927 Author: Antonio Vazquez Date: Fri Jun 29 10:13:50 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB0c1c619681fd12d4a35a3f2ec8bbc36b40ddf927 Fix draw back error due z-depth precission The value 1.0 makes the image

[Bf-blender-cvs] [3169160a974] blender2.8: Workbench: TAA optimalization

Commit: 3169160a9741ff399059ce9900ac8cd503707b2f Author: Jeroen Bakker Date: Fri Jun 29 09:22:50 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB3169160a9741ff399059ce9900ac8cd503707b2f Workbench: TAA optimalization First frame of the TAA is just a regular copy of the previous

[Bf-blender-cvs] [3587e5ca1ef] greasepencil-object: Fix problem when increase viewport qualitty

Commit: 3587e5ca1ef3d21182153491c009e6e3cfafdd34 Author: Antonio Vazquez Date: Fri Jun 29 09:52:30 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB3587e5ca1ef3d21182153491c009e6e3cfafdd34 Fix problem when increase viewport qualitty The reason of the problem was the

[Bf-blender-cvs] [6ece1257398] greasepencil-object: Fix again the pointer name for textures

Commit: 6ece1257398a778fa2815131680f1890fefda770 Author: Antonio Vazquez Date: Fri Jun 29 09:42:43 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB6ece1257398a778fa2815131680f1890fefda770 Fix again the pointer name for textures

[Bf-blender-cvs] [2784f1b6fc3] greasepencil-object: Cleanup unused extern definition

Commit: 2784f1b6fc3ade71c8f5a930f1375d13b1b29da1 Author: Antonio Vazquez Date: Fri Jun 29 09:43:34 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB2784f1b6fc3ade71c8f5a930f1375d13b1b29da1 Cleanup unused extern definition This was part of old VFX modifiers.

[Bf-blender-cvs] [2cdb08f4ffb] gsoc-2018-many-light-sampling: Cycles: Background lights works with light tree

Commit: 2cdb08f4ffb3d7d24935d82ba32b1b1100ee2cd6 Author: Erik Englesson Date: Wed Jun 27 16:59:01 2018 +0200 Branches: gsoc-2018-many-light-sampling https://developer.blender.org/rB2cdb08f4ffb3d7d24935d82ba32b1b1100ee2cd6 Cycles: Background lights works with light tree Added support for

[Bf-blender-cvs] [0dbbedbf0f7] greasepencil-object: Cleanup code

Commit: 0dbbedbf0f7176eff4c7a607917f9c3a725a8d6d Author: Antonio Vazquez Date: Fri Jun 29 10:58:17 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB0dbbedbf0f7176eff4c7a607917f9c3a725a8d6d Cleanup code ===

[Bf-blender-cvs] [ebadf391e33] greasepencil-object: Fix render type name error

Commit: ebadf391e336107055f4a85976bbba077f29535f Author: Antonio Vazquez Date: Fri Jun 29 11:04:43 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rBebadf391e336107055f4a85976bbba077f29535f Fix render type name error

[Bf-blender-cvs] [78f943d1866] temp-greasepencil-vfx: Merge branch 'greasepencil-object' into temp-greasepencil-vfx

Commit: 78f943d1866821a603bd18a626610d857a05bea3 Author: Antonio Vazquez Date: Fri Jun 29 11:10:21 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rB78f943d1866821a603bd18a626610d857a05bea3 Merge branch 'greasepencil-object' into temp-greasepencil-vfx

[Bf-blender-cvs] [2b0507b0d9d] temp-greasepencil-vfx: Cleanup: Reorder FX effects list and remove unused code

Commit: 2b0507b0d9d636d3407ebcbcdab2b31b5a63cb6e Author: Antonio Vazquez Date: Fri Jun 29 11:36:10 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rB2b0507b0d9d636d3407ebcbcdab2b31b5a63cb6e Cleanup: Reorder FX effects list and remove unused code

[Bf-blender-cvs] [65a31da55b8] temp-greasepencil-vfx: Cleanup: Silence compiler warnings

Commit: 65a31da55b88b86d370f08f9f54da6d30883d42f Author: Antonio Vazquez Date: Fri Jun 29 11:42:05 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rB65a31da55b88b86d370f08f9f54da6d30883d42f Cleanup: Silence compiler warnings

[Bf-blender-cvs] [04f89292711] blender2.8: Workbench: Transparent textures

Commit: 04f8929271148659f3157fd728f7437e6409a29f Author: Jeroen Bakker Date: Fri Jun 29 12:05:23 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB04f8929271148659f3157fd728f7437e6409a29f Workbench: Transparent textures Worknemch now supports transparent textures. As the main

[Bf-blender-cvs] [7cd45e17138] tmp_hair_curves: Rename "guide" curves to "fiber" curves.

Commit: 7cd45e17138ef10eaf1d5e038b3c7ff42ae9f9c3 Author: Lukas Tönne Date: Fri Jun 29 15:11:27 2018 +0100 Branches: tmp_hair_curves https://developer.blender.org/rB7cd45e17138ef10eaf1d5e038b3c7ff42ae9f9c3 Rename "guide" curves to "fiber" curves. Guide curves should be a higher-level concept.

[Bf-blender-cvs] [3aa61499d06] blender2.8: Fix unnecessary empty space in shading popover.

Commit: 3aa61499d06960eef7a0f64e32bfb88694dc315a Author: Brecht Van Lommel Date: Fri Jun 29 17:46:16 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB3aa61499d06960eef7a0f64e32bfb88694dc315a Fix unnecessary empty space in shading popover.

[Bf-blender-cvs] [1b13fdaf80e] greasepencil-object: Annotations: Restore 3D View support for annotations (WIP)

Commit: 1b13fdaf80e938664c712c01dd7dfa8e7bdb6956 Author: Joshua Leung Date: Sat Jun 30 02:50:39 2018 +1200 Branches: greasepencil-object https://developer.blender.org/rB1b13fdaf80e938664c712c01dd7dfa8e7bdb6956 Annotations: Restore 3D View support for annotations (WIP) Initial support for

[Bf-blender-cvs] [e2626831dc7] greasepencil-object: Annotations Keymap: Restore D-RMB for eraser

Commit: e2626831dc73fde5c0fb98e79ec383bcc24717fd Author: Joshua Leung Date: Sat Jun 30 02:42:35 2018 +1200 Branches: greasepencil-object https://developer.blender.org/rBe2626831dc73fde5c0fb98e79ec383bcc24717fd Annotations Keymap: Restore D-RMB for eraser

[Bf-blender-cvs] [8308a051b49] greasepencil-object: Cleanup: Remove redundant code + note some code issues to fix

Commit: 8308a051b49f2ebed061633231ad7fc1d5cddedd Author: Joshua Leung Date: Sat Jun 30 02:42:15 2018 +1200 Branches: greasepencil-object https://developer.blender.org/rB8308a051b49f2ebed061633231ad7fc1d5cddedd Cleanup: Remove redundant code + note some code issues to fix

[Bf-blender-cvs] [f52a7a0a4c1] hair_guides_grooming: Enable groom drawing in forward shading of the workbench engine.

Commit: f52a7a0a4c118967c09b4a034911a9d9816935b9 Author: Lukas Tönne Date: Fri Jun 29 11:13:11 2018 +0100 Branches: hair_guides_grooming https://developer.blender.org/rBf52a7a0a4c118967c09b4a034911a9d9816935b9 Enable groom drawing in forward shading of the workbench engine.

[Bf-blender-cvs] [d44dec7a38c] temp-greasepencil-vfx: Clenaup: More compiler warnings

Commit: d44dec7a38c6809a6a377ecbb73de613ed13c10c Author: Antonio Vazquez Date: Fri Jun 29 11:55:29 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rBd44dec7a38c6809a6a377ecbb73de613ed13c10c Clenaup: More compiler warnings

[Bf-blender-cvs] [441d4365cfa] temp-greasepencil-vfx: Initial implementation of Shader FX (effects).

Commit: 441d4365cfa243622b90806dd5b40d8e037e3684 Author: Antonio Vazquez Date: Fri Jun 29 11:58:34 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rB441d4365cfa243622b90806dd5b40d8e037e3684 Initial implementation of Shader FX (effects). Now, the FX are used only by

[Bf-blender-cvs] [1f7baa41e1a] temp-greasepencil-vfx: Cleanup: Fix comments

Commit: 1f7baa41e1a7723b66a7809ed97a0c1c4723a6fd Author: Antonio Vazquez Date: Fri Jun 29 12:33:29 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rB1f7baa41e1a7723b66a7809ed97a0c1c4723a6fd Cleanup: Fix comments

[Bf-blender-cvs] [f2c4a24b8be] temp-greasepencil-vfx: Fix merge error

Commit: f2c4a24b8be828cd4081af1b6b35a03c478e2a30 Author: Antonio Vazquez Date: Fri Jun 29 11:48:31 2018 +0200 Branches: temp-greasepencil-vfx https://developer.blender.org/rBf2c4a24b8be828cd4081af1b6b35a03c478e2a30 Fix merge error

[Bf-blender-cvs] [bc0f4896196] greasepencil-object: Set annotions drawing mode always on top

Commit: bc0f489619648adf2b68b0ee876cf8c1c37646bb Author: Antonio Vazquez Date: Fri Jun 29 12:51:07 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rBbc0f489619648adf2b68b0ee876cf8c1c37646bb Set annotions drawing mode always on top The annotations must be visible on top

[Bf-blender-cvs] [ece72c9ec0c] blender2.8: Keymap: re-enable object apply transform

Commit: ece72c9ec0c706f137ba0bc80af732786ca9990f Author: Campbell Barton Date: Fri Jun 29 14:12:52 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBece72c9ec0c706f137ba0bc80af732786ca9990f Keymap: re-enable object apply transform

[Bf-blender-cvs] [2223d63c58c] blender2.8: Refactor static override code to pass Main around.

Commit: 2223d63c58c9a2125fb4a2e6ee1c780c781a95bb Author: Bastien Montagne Date: Fri Jun 29 12:46:54 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB2223d63c58c9a2125fb4a2e6ee1c780c781a95bb Refactor static override code to pass Main around. Access to main database is actually

[Bf-blender-cvs] [3eff6f7a5ed] blender2.8: Cleanup: some moar DM kicking, in armature edit code.

Commit: 3eff6f7a5ed5f04745b372625d0dc58f0a52be9a Author: Bastien Montagne Date: Thu Jun 28 15:42:00 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB3eff6f7a5ed5f04745b372625d0dc58f0a52be9a Cleanup: some moar DM kicking, in armature edit code.

[Bf-blender-cvs] [3733be8731d] blender2.8: Cleanup: nuke G.main from BKE's particle_system.c

Commit: 3733be8731df978ec50cd283ff24b813bdd89df1 Author: Bastien Montagne Date: Fri Jun 29 11:24:58 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB3733be8731df978ec50cd283ff24b813bdd89df1 Cleanup: nuke G.main from BKE's particle_system.c

[Bf-blender-cvs] [dcdde6bedbf] blender2.8: Keymap: minimal default keymap

Commit: dcdde6bedbfd78b4cd4d86e23859e10a4c619482 Author: Campbell Barton Date: Fri Jun 29 12:46:16 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBdcdde6bedbfd78b4cd4d86e23859e10a4c619482 Keymap: minimal default keymap Use 2.7x keymap preset for full keymap. Use define to

[Bf-blender-cvs] [dc766bfffcd] hair_guides: Rename the fur modifier to hair modifier.

Commit: dc766bfffcd75f6c498f0cba92585b6a67a6925c Author: Lukas Tönne Date: Fri Jun 29 13:21:33 2018 +0100 Branches: hair_guides https://developer.blender.org/rBdc766bfffcd75f6c498f0cba92585b6a67a6925c Rename the fur modifier to hair modifier.

[Bf-blender-cvs] [614868b5714] hair_guides: Generic modifier copy already deletes target data, explicit freeing is redundant.

Commit: 614868b5714ba05303e2581bd24d54dc4b2f8c97 Author: Lukas Tönne Date: Fri Jun 29 13:32:34 2018 +0100 Branches: hair_guides https://developer.blender.org/rB614868b5714ba05303e2581bd24d54dc4b2f8c97 Generic modifier copy already deletes target data, explicit freeing is redundant.

[Bf-blender-cvs] [ccca2c01649] blender2.8: Workbench: Spherical Harmonics tests

Commit: ccca2c01649106ee24ad7407f182919eceda5bd9 Author: Jeroen Bakker Date: Fri Jun 29 14:54:38 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBccca2c01649106ee24ad7407f182919eceda5bd9 Workbench: Spherical Harmonics tests Added a compile directive in order to test SH4 in stead

[Bf-blender-cvs] [e4cc8ecd073] hair_guides_grooming: Merge branch 'hair_guides' into hair_guides_grooming

Commit: e4cc8ecd07377f58fd11301874cb1c9da44ae2bf Author: Lukas Tönne Date: Fri Jun 29 13:40:33 2018 +0100 Branches: hair_guides_grooming https://developer.blender.org/rBe4cc8ecd07377f58fd11301874cb1c9da44ae2bf Merge branch 'hair_guides' into hair_guides_grooming

[Bf-blender-cvs] [a59df21ad82] blender2.8: Fix T55645: broken particle Use Count option for instancing objects.

Commit: a59df21ad8282c20f33a216ba9e3ba739881577d Author: Brecht Van Lommel Date: Thu Jun 28 14:29:54 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBa59df21ad8282c20f33a216ba9e3ba739881577d Fix T55645: broken particle Use Count option for instancing objects. There is now a

[Bf-blender-cvs] [744a806d7f9] soc-2018-hair-shader: Merge branch 'master' into soc-2018-hair-shader

Commit: 744a806d7f9e5f2f8b86adf05b0c7e2c82ff16df Author: L. E. Segovia Date: Fri Jun 29 12:56:49 2018 + Branches: soc-2018-hair-shader https://developer.blender.org/rB744a806d7f9e5f2f8b86adf05b0c7e2c82ff16df Merge branch 'master' into soc-2018-hair-shader Week 7 merge: no issues

[Bf-blender-cvs] [ccacf3ae3cf] master: Cycles: change AO node default to 16 samples and only local off.

Commit: ccacf3ae3cff9e0291a3fa77991c4a94edf5043f Author: Brecht Van Lommel Date: Fri Jun 29 15:02:09 2018 +0200 Branches: master https://developer.blender.org/rBccacf3ae3cff9e0291a3fa77991c4a94edf5043f Cycles: change AO node default to 16 samples and only local off.

[Bf-blender-cvs] [5ba87cf22eb] blender2.8: Cleanup: remove another bunch of DM usages, includes etc.

Commit: 5ba87cf22ebdfa660ec2044a8e97c3501c573176 Author: Bastien Montagne Date: Fri Jun 29 14:56:38 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB5ba87cf22ebdfa660ec2044a8e97c3501c573176 Cleanup: remove another bunch of DM usages, includes etc.

[Bf-blender-cvs] [136991be1a8] gsoc-2018-many-light-sampling: Merge branch 'master' into gsoc-2018-many-light-sampling

Commit: 136991be1a8afc6938c587558a0a75f096888d5a Author: Erik Englesson Date: Fri Jun 29 11:02:18 2018 +0200 Branches: gsoc-2018-many-light-sampling https://developer.blender.org/rB136991be1a8afc6938c587558a0a75f096888d5a Merge branch 'master' into gsoc-2018-many-light-sampling

[Bf-blender-cvs] [5c10bd4f199] gsoc-2018-many-light-sampling: Fix: Merge conflict with background resolution

Commit: 5c10bd4f199377fc2d0aaeadfd99d7c5ab511d95 Author: Erik Englesson Date: Fri Jun 29 16:25:28 2018 +0200 Branches: gsoc-2018-many-light-sampling https://developer.blender.org/rB5c10bd4f199377fc2d0aaeadfd99d7c5ab511d95 Fix: Merge conflict with background resolution