blender.git
3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 18:37:10 +0000 (20:37 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space cmake, make.bat
Campbell Barton [Sun, 17 Jun 2018 18:18:09 +0000 (20:18 +0200)]
Cleanup: trailing space cmake, make.bat

3 years agoCleanup: trailing space in CMake files
Campbell Barton [Sun, 17 Jun 2018 18:15:24 +0000 (20:15 +0200)]
Cleanup: trailing space in CMake files

3 years agoEdit Mesh: Fix buggy occlusion when in xray mode.
Clément Foucault [Sun, 17 Jun 2018 18:11:23 +0000 (20:11 +0200)]
Edit Mesh: Fix buggy occlusion when in xray mode.

This mimics the behaviour of the old wireframe mode. When in Xray mode,
don't use the limit selection to visible option.

Also hide the option if Xray is enabled.

3 years agoPython: Allow untrusted py-drivers to run limited expressions
Campbell Barton [Sun, 17 Jun 2018 17:51:05 +0000 (19:51 +0200)]
Python: Allow untrusted py-drivers to run limited expressions

Limit to a restricted set of built-ins, as well as the math module.
Also restrict of op-codes, disallowing imports and attribute access.

This allows most math expressions to run
without any performance cost once the initial check is done.

See: D1862 for details.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 15:10:19 +0000 (17:10 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space for remaining source/
Campbell Barton [Sun, 17 Jun 2018 15:06:28 +0000 (17:06 +0200)]
Cleanup: trailing space for remaining source/

3 years agoCleanup: trailing space for blenloader
Campbell Barton [Sun, 17 Jun 2018 15:06:07 +0000 (17:06 +0200)]
Cleanup: trailing space for blenloader

3 years agoCleanup: trailing space for blenkernel
Campbell Barton [Sun, 17 Jun 2018 15:05:51 +0000 (17:05 +0200)]
Cleanup: trailing space for blenkernel

3 years agoCleanup: trailing space for compositor
Campbell Barton [Sun, 17 Jun 2018 15:05:29 +0000 (17:05 +0200)]
Cleanup: trailing space for compositor

3 years agoCleanup: trailing space for freestyle
Campbell Barton [Sun, 17 Jun 2018 15:05:14 +0000 (17:05 +0200)]
Cleanup: trailing space for freestyle

3 years agoCleanup: trailing space for imbuf module
Campbell Barton [Sun, 17 Jun 2018 15:04:54 +0000 (17:04 +0200)]
Cleanup: trailing space for imbuf module

3 years agoCleanup: trailing space for modifiers
Campbell Barton [Sun, 17 Jun 2018 15:04:27 +0000 (17:04 +0200)]
Cleanup: trailing space for modifiers

3 years agoCleanup: trailing space for DNA headers
Campbell Barton [Sun, 17 Jun 2018 15:04:09 +0000 (17:04 +0200)]
Cleanup: trailing space for DNA headers

3 years agoCleanup: trailing space in source/gameengine/
Campbell Barton [Sun, 17 Jun 2018 15:01:43 +0000 (17:01 +0200)]
Cleanup: trailing space in source/gameengine/

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 14:36:30 +0000 (16:36 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space for BLI
Campbell Barton [Sun, 17 Jun 2018 14:32:54 +0000 (16:32 +0200)]
Cleanup: trailing space for BLI

3 years agoCleanup: remove unused BLI_rebase_path
Campbell Barton [Sun, 17 Jun 2018 14:26:47 +0000 (16:26 +0200)]
Cleanup: remove unused BLI_rebase_path

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 14:18:15 +0000 (16:18 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: BLI path extension API
Campbell Barton [Sun, 17 Jun 2018 14:13:24 +0000 (16:13 +0200)]
Cleanup: BLI path extension API

Use BLI_path_extension_* prefix.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)]
Merge branch 'master' into blender2.8

3 years agoBLI_path: add string size debug define
Campbell Barton [Sun, 17 Jun 2018 13:35:00 +0000 (15:35 +0200)]
BLI_path: add string size debug define

Off by default, only for debugging.

3 years agoDriver: trailing zeros from expression
Campbell Barton [Sun, 17 Jun 2018 12:50:42 +0000 (14:50 +0200)]
Driver: trailing zeros from expression

3 years ago3D View: 3D Cursor was not restoring GL state
Campbell Barton [Sun, 17 Jun 2018 12:43:31 +0000 (14:43 +0200)]
3D View: 3D Cursor was not restoring GL state

Caused camera frame to be double width.

3 years agoUI: hide decorators in panels w/o animated buttons
Campbell Barton [Sun, 17 Jun 2018 10:38:28 +0000 (12:38 +0200)]
UI: hide decorators in panels w/o animated buttons

3 years agoEdit Mesh: tweak active face edge width
Campbell Barton [Sun, 17 Jun 2018 10:26:49 +0000 (12:26 +0200)]
Edit Mesh: tweak active face edge width

This rewinds a change from own commit e3d88b021c07d
The only took edge overlay into account (crease, seam.. etc)
Currently active-face also uses this width.

While the difference is subtle,
this makes the active-face stand out more clearly.

3 years agoUI: correct decorator buttons 'enabled' flag
Campbell Barton [Sun, 17 Jun 2018 10:08:33 +0000 (12:08 +0200)]
UI: correct decorator buttons 'enabled' flag

3 years agoUI: decorator color button assert
Campbell Barton [Sun, 17 Jun 2018 10:13:14 +0000 (12:13 +0200)]
UI: decorator color button assert

Also set 'all' argument based on the RNA-index
(even though it worked, better set to correct value).

3 years agoCleanup: codestyle
Campbell Barton [Sun, 17 Jun 2018 10:03:22 +0000 (12:03 +0200)]
Cleanup: codestyle

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 09:57:49 +0000 (11:57 +0200)]
Merge branch 'master' into blender2.8

3 years agoCMake: add missing headers
Campbell Barton [Sun, 17 Jun 2018 09:56:20 +0000 (11:56 +0200)]
CMake: add missing headers

3 years agoCleanup: use clamp_* from BLI_math (replace macro)
Campbell Barton [Sun, 17 Jun 2018 09:50:56 +0000 (11:50 +0200)]
Cleanup: use clamp_* from BLI_math (replace macro)

3 years agoMerge branch 'blender2.8' of git.blender.org:blender into blender2.8
Ray Molenkamp [Sun, 17 Jun 2018 03:49:40 +0000 (21:49 -0600)]
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

3 years agoFix : Build error with uchar in intern_gawain.
Ray Molenkamp [Sun, 17 Jun 2018 03:49:11 +0000 (21:49 -0600)]
Fix : Build error with uchar in intern_gawain.

error introduced by  D3483, intern_gawain has no access to bli_systypes.h

3 years agoCustom Hdri: Use same AntiAliasing as Matcaps
Clément Foucault [Sat, 16 Jun 2018 21:28:28 +0000 (23:28 +0200)]
Custom Hdri: Use same AntiAliasing as Matcaps

3 years agoStudioLights: Fix preview icon.
Clément Foucault [Sat, 16 Jun 2018 21:02:33 +0000 (23:02 +0200)]
StudioLights: Fix preview icon.

Use same antialiasing method as the matcaps and fix the normal computation.

3 years agoMatcap: Make matcap preview the same size as the other StudioLights
Clément Foucault [Sat, 16 Jun 2018 20:42:39 +0000 (22:42 +0200)]
Matcap: Make matcap preview the same size as the other StudioLights

3 years agoMatcaps: Add AntiAlias alpha mask to icon preview.
Clément Foucault [Sat, 16 Jun 2018 20:32:58 +0000 (22:32 +0200)]
Matcaps: Add AntiAlias alpha mask to icon preview.

3 years agoStudio Light: Fix typo
Clément Foucault [Sat, 16 Jun 2018 19:11:15 +0000 (21:11 +0200)]
Studio Light: Fix typo

3 years agoOutlines: Don't draw Xray mode outlines in material or render mode
Clément Foucault [Sat, 16 Jun 2018 19:05:24 +0000 (21:05 +0200)]
Outlines: Don't draw Xray mode outlines in material or render mode

3 years agoGLRefactor: Remove all GL types from gawains public headers.
Ray Molenkamp [Sat, 16 Jun 2018 18:44:20 +0000 (12:44 -0600)]
GLRefactor: Remove all GL types from gawains public headers.

In preparation for possible alternative back-ends, the dependency on glew.h needs to be confined to as few libraries as possible. This patch removes all gl types from the public gawain headers.

It'll need some more refactoring later on, but for now this will suffice.

Reviewer: brecht, fclem

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

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Sat, 16 Jun 2018 18:30:56 +0000 (12:30 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agomake.bat: Fix `make showhashes` not working.
Ray Molenkamp [Sat, 16 Jun 2018 18:29:38 +0000 (12:29 -0600)]
make.bat: Fix `make showhashes` not working.

broke in recent refactor.

3 years agoUI: show decorator icon for static-override
Campbell Barton [Sat, 16 Jun 2018 16:26:34 +0000 (18:26 +0200)]
UI: show decorator icon for static-override

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Sat, 16 Jun 2018 16:02:50 +0000 (18:02 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: remove BLI_frand from GreasePencil code.
Bastien Montagne [Sat, 16 Jun 2018 16:02:02 +0000 (18:02 +0200)]
Cleanup: remove BLI_frand from GreasePencil code.

3 years agoCorrect assert in recent changes
Campbell Barton [Sat, 16 Jun 2018 15:31:37 +0000 (17:31 +0200)]
Correct assert in recent changes

3 years agoUI: support dragging to key-frame
Campbell Barton [Sat, 16 Jun 2018 14:19:18 +0000 (16:19 +0200)]
UI: support dragging to key-frame

3 years agoUI: Add property decorator buttons
Campbell Barton [Sat, 16 Jun 2018 12:48:21 +0000 (14:48 +0200)]
UI: Add property decorator buttons

When use_property_split is enabled, this template adds
buttons to set keyframes, (Alternative to showing color).

See: T54951

3 years agoFix T55427: Removing Vertex Group used by Data Transfer Modifier results in crash.
Bastien Montagne [Sat, 16 Jun 2018 14:19:53 +0000 (16:19 +0200)]
Fix T55427: Removing Vertex Group used by Data Transfer Modifier results in crash.

Only fixing crash, proper handling (a.k.a remapping) of all
possible cases here, for all possible data layers, is rather involved...

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sat, 16 Jun 2018 14:16:53 +0000 (16:16 +0200)]
Merge branch 'master' into blender2.8

3 years agoUI: refactor drag-toggle for other button types
Campbell Barton [Sat, 16 Jun 2018 14:04:26 +0000 (16:04 +0200)]
UI: refactor drag-toggle for other button types

3 years agoEdit Mesh: Simplify the overlay shader.
Clément Foucault [Sat, 16 Jun 2018 13:15:37 +0000 (15:15 +0200)]
Edit Mesh: Simplify the overlay shader.

Remove all the clip cases and just pass the vertices screen position to the
fragment shader.

This does put a bit more pressure on the fragment shader but it seems to be
faster than before. And it simplify the code a lot.

It seems to fix some long standing issue on some intel GPU.

3 years agoEdit Mode: Fix bad display of edges when limit selection mode is Off.
Clément Foucault [Fri, 15 Jun 2018 20:09:10 +0000 (22:09 +0200)]
Edit Mode: Fix bad display of edges when limit selection mode is Off.

3 years agoUI: minor changes from 2.8
Campbell Barton [Sat, 16 Jun 2018 13:44:13 +0000 (15:44 +0200)]
UI: minor changes from 2.8

- Option to skip multi-data edits.
- Open hold buttons on drag.
- Utility function to set default value.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)]
Merge branch 'master' into blender2.8

3 years agoCycles Cleanup: Remove unneccessary color management call
Lukas Stockner [Sat, 16 Jun 2018 11:47:49 +0000 (13:47 +0200)]
Cycles Cleanup: Remove unneccessary color management call

3 years agoThis option limits visibility of the glew.h header to just bf_gpu and intern_gawain
Ray Molenkamp [Sat, 16 Jun 2018 02:17:16 +0000 (20:17 -0600)]
This option limits visibility of the glew.h header to just bf_gpu and intern_gawain
this is to highlight areas in the code that still directly do opengl calls or use
opengl types.

This is in preparation for supporting alternative rendering back-ends.

Reviewers: brecht, fclem

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

3 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Fri, 15 Jun 2018 21:04:35 +0000 (23:04 +0200)]
Merge branch 'master' into blender2.8

The Eevee AO node supports the new Normal socket, but ignores Distance,
Samples, Inside and Only Local settings.

3 years agoCycles: change Ambient Occlusion shader to output colors.
Lukas Stockner [Fri, 15 Jun 2018 09:03:29 +0000 (11:03 +0200)]
Cycles: change Ambient Occlusion shader to output colors.

This means the shader can now be used for procedural texturing. New
settings on the node are Samples, Inside, Local Only and Distance.

Original patch by Lukas with further changes by Brecht.

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

3 years agoUI: fix redundant scrolling in the redo panel
Campbell Barton [Fri, 15 Jun 2018 19:05:49 +0000 (21:05 +0200)]
UI: fix redundant scrolling in the redo panel

3 years agoCleanup: code style
Campbell Barton [Fri, 15 Jun 2018 18:55:37 +0000 (20:55 +0200)]
Cleanup: code style

3 years agoEdit Mesh: tweak vertex size & edge width
Campbell Barton [Fri, 15 Jun 2018 18:09:38 +0000 (20:09 +0200)]
Edit Mesh: tweak vertex size & edge width

- Vertex size now matches the theme setting.
- Edge width is closer to a single pixel line.
- Face dot was scaled up to be drawn as a circle,
  but is currently a square.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 15 Jun 2018 17:12:44 +0000 (19:12 +0200)]
Merge branch 'master' into blender2.8

3 years agoWM: suppress drag events if motion is handled
Campbell Barton [Fri, 15 Jun 2018 17:09:43 +0000 (19:09 +0200)]
WM: suppress drag events if motion is handled

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: some more G.main removal.
Bastien Montagne [Fri, 15 Jun 2018 15:42:17 +0000 (17:42 +0200)]
Cleanup: some more G.main removal.

We are really starting to scratch the last bits here...

3 years agoWorkbench OpenGL render: always render alpha on 1.0
Jeroen Bakker [Fri, 15 Jun 2018 15:40:18 +0000 (17:40 +0200)]
Workbench OpenGL render: always render alpha on 1.0

Old implementation rendered alpha to 0.0 for background, but only during
deferred rendering. We should attach this to an DNA setting and also let
the forward shading respect this. But for now this is a better default

3 years agoCleanup: validate G.main's in creator code.
Bastien Montagne [Fri, 15 Jun 2018 15:36:44 +0000 (17:36 +0200)]
Cleanup: validate G.main's in creator code.

Using G_MAIN here is valid!

3 years agoCleanup: G.main removal from 2.8-only code.
Bastien Montagne [Fri, 15 Jun 2018 15:33:24 +0000 (17:33 +0200)]
Cleanup: G.main removal from 2.8-only code.

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Fri, 15 Jun 2018 15:25:41 +0000 (17:25 +0200)]
Merge branch 'master' into blender2.8

3 years agoHair editing: Use original object's particles for drawing
Sergey Sharybin [Fri, 15 Jun 2018 15:22:31 +0000 (17:22 +0200)]
Hair editing: Use original object's particles for drawing

This allows to rely on brush to update children positions,
and avoid tag of object. Makes it way faster to comb with
children enabled.

3 years agoHair editing: Multi-thread various parts
Sergey Sharybin [Fri, 15 Jun 2018 08:22:44 +0000 (10:22 +0200)]
Hair editing: Multi-thread various parts

Currently focused on making parts which are a bottleneck for Spring,
to make things fast as possible. There are surely lots of places
where threading is not currently done, but we can keep doing this,
maybe even with help from the community :)

3 years agoHair editing: Only tag Copy-on-Write when children are enabled
Sergey Sharybin [Fri, 15 Jun 2018 08:11:50 +0000 (10:11 +0200)]
Hair editing: Only tag Copy-on-Write when children are enabled

Without children we only need to update batch cache. This way
we don't re-evaluate the whole modifier stack just to perform
child particles redistribution.

3 years agoCleanup: some more G.main removal/validation...
Bastien Montagne [Fri, 15 Jun 2018 15:21:07 +0000 (17:21 +0200)]
Cleanup: some more G.main removal/validation...

3 years agoDependency graph fixes for RigidBodyWorld
Sybren A. Stüvel [Fri, 15 Jun 2018 15:14:48 +0000 (17:14 +0200)]
Dependency graph fixes for RigidBodyWorld

- rbw->group added to the depsgraph.
- Mesh evaluation added when necessary.
- Prevent of double-free by freeing the scene before objects.

3 years agoKeymap: use click event for tab-key
Campbell Barton [Fri, 15 Jun 2018 15:09:17 +0000 (17:09 +0200)]
Keymap: use click event for tab-key

Checking release events would toggle edit-mode during alt-tab
cycling on X11.

Now both press and release events are needed.

3 years agoWorkbench: Disable AA when doing opengl render.
Jeroen Bakker [Fri, 15 Jun 2018 14:49:23 +0000 (16:49 +0200)]
Workbench: Disable AA when doing opengl render.

- OpenGL uses linear space and has its own AA. So we don't calculate
when doing opengl rendering.

3 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)]
Merge branch 'master' into blender2.8

3 years agoFix more Cycles CUDA errors after recent changes.
Brecht Van Lommel [Fri, 15 Jun 2018 13:58:48 +0000 (15:58 +0200)]
Fix more Cycles CUDA errors after recent changes.

3 years agoFix T55443: Manipulators not refreshing
Dalai Felinto [Fri, 15 Jun 2018 13:44:14 +0000 (15:44 +0200)]
Fix T55443: Manipulators not refreshing

3 years agoMerge branch 'master' into blender28
Campbell Barton [Fri, 15 Jun 2018 13:42:42 +0000 (15:42 +0200)]
Merge branch 'master' into blender28

3 years agoCleanup: warning
Campbell Barton [Fri, 15 Jun 2018 13:42:31 +0000 (15:42 +0200)]
Cleanup: warning

3 years agoMeshEditMode: refactor
Jeroen Bakker [Fri, 15 Jun 2018 13:36:04 +0000 (15:36 +0200)]
MeshEditMode: refactor

- added a lib for shaded functions
- decreased active face inner size

3 years agoFix crash with x-ray and redo panel
Dalai Felinto [Fri, 15 Jun 2018 12:58:45 +0000 (14:58 +0200)]
Fix crash with x-ray and redo panel

Code was assuming any area with region data was the main one.
This is no longer the case.

3 years agoFix T55490, intersect two triangles fails.
Howard Trickey [Fri, 15 Jun 2018 12:48:45 +0000 (08:48 -0400)]
Fix T55490, intersect two triangles fails.

Need to use the 'use_partial_connect' option in island connect,
so changed signatures of various functions to pass that into and
then down from BM_mesh_intersect (making true for intersect, false
for boolean).
Then fix bm_face_split_edgenet_partial_connect to work when
input edges are not necessarily wire, but at least not in the
face they are being connected in. That caused generalization
of core BM_vert_separate_hflag_wire (which is only used in
this one place in all Blender).

3 years agoConverted Rigid Body from DerivedMesh to Mesh
Sybren A. Stüvel [Fri, 15 Jun 2018 08:45:08 +0000 (10:45 +0200)]
Converted Rigid Body from DerivedMesh to Mesh

3 years agoWorkbench: FXAA
Jeroen Bakker [Fri, 15 Jun 2018 12:05:49 +0000 (14:05 +0200)]
Workbench: FXAA

- do the FXAA pass after the color management. Be aware that during
rendering this is still being done in linear space

3 years agoWorkbench: FXAA
Jeroen Bakker [Fri, 15 Jun 2018 10:05:25 +0000 (12:05 +0200)]
Workbench: FXAA

FXAA implementation in the deferred renderpass of the workbench.
Can be enabled per 3dview. Eventually this will also be a user setting
as it is more a system/performance setting than a scene setting.

3 years agoT55486: use GPU_R11F_G11F_B10F for target of Xray compo
Jeroen Bakker [Fri, 15 Jun 2018 07:10:39 +0000 (09:10 +0200)]
T55486: use GPU_R11F_G11F_B10F for target of Xray compo

3 years agoT55486: use GPU_R11F_G11F_B10F for Matcaps
Jeroen Bakker [Fri, 15 Jun 2018 06:57:49 +0000 (08:57 +0200)]
T55486: use GPU_R11F_G11F_B10F for Matcaps

3 years agoTool System: workaround click conflicting w/ add brush
Campbell Barton [Fri, 15 Jun 2018 10:28:19 +0000 (12:28 +0200)]
Tool System: workaround click conflicting w/ add brush

3 years agoFix T55408: Double transforms on parents/children.
Bastien Montagne [Fri, 15 Jun 2018 10:17:26 +0000 (12:17 +0200)]
Fix T55408: Double transforms on parents/children.

object.base_flag was not synced back from evaluated ID to original one.
Similar thing as copying back to original transform matrix, avoids
having to get data from evaluated one in lots of cases.

3 years agoMerge branch 'master' into blender2.8
Philipp Oeser [Fri, 15 Jun 2018 08:44:33 +0000 (10:44 +0200)]
Merge branch 'master' into blender2.8

3 years agoFix (unreported) Text Editor: scrollbar exiting early
Philipp Oeser [Fri, 15 Jun 2018 08:25:18 +0000 (10:25 +0200)]
Fix (unreported) Text Editor: scrollbar exiting early

caused by recent clickdrag changes

3 years agoFix Cycles CUDA error after recent changes.
Brecht Van Lommel [Fri, 15 Jun 2018 08:06:32 +0000 (10:06 +0200)]
Fix Cycles CUDA error after recent changes.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 15 Jun 2018 08:25:41 +0000 (10:25 +0200)]
Merge branch 'master' into blender2.8

3 years agoWM: 2.8 screen compatibility
Campbell Barton [Fri, 15 Jun 2018 08:23:03 +0000 (10:23 +0200)]
WM: 2.8 screen compatibility

Without these minor changes loading files from 2.8 will crash.

Manually applied edits from 26786a2b87a08

3 years agoFix mouse input overwriting transform redo values
Campbell Barton [Fri, 15 Jun 2018 06:45:31 +0000 (08:45 +0200)]
Fix mouse input overwriting transform redo values

Redo trackball rotate and edge slide weren't working.

Caused by re-ordering of initialization 47de0321bf68c

3 years agoCleanup: unused var
Campbell Barton [Fri, 15 Jun 2018 06:02:17 +0000 (08:02 +0200)]
Cleanup: unused var