blender.git
3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: correct C/C++ using space
Campbell Barton [Tue, 19 Jun 2018 05:48:12 +0000 (07:48 +0200)]
editorconfig: correct C/C++ using space

3 years agoGhost: Fix offline OGL render on windows.
Ray Molenkamp [Tue, 19 Jun 2018 00:10:45 +0000 (18:10 -0600)]
Ghost: Fix offline OGL render on windows.

rBe0c088f8fb5a introduced offline rendering support on windows, sadly it was trying to use the desktop window for getting a context, which given SetPixelFormat can only be called once for any given HDC was an unfortunate choice.

This patch uses a temporary hidden window for getting the opengl context.

Reviewers: mano-wii

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

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Mon, 18 Jun 2018 19:40:39 +0000 (13:40 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agomake.bat: Fix msvc-2017 detection.
Ray Molenkamp [Mon, 18 Jun 2018 19:39:12 +0000 (13:39 -0600)]
make.bat: Fix msvc-2017 detection.

D3485 by @manung

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

3 years agoCleanup: code-style
Campbell Barton [Mon, 18 Jun 2018 18:58:08 +0000 (20:58 +0200)]
Cleanup: code-style

3 years agoObject Mode: make mode locking optional
Campbell Barton [Mon, 18 Jun 2018 18:40:41 +0000 (20:40 +0200)]
Object Mode: make mode locking optional

Design from T55246 is kept while allowing 2.7x behavior.

3 years agoFix a very nasty and sneaky bug in lib remap / static override code.
Bastien Montagne [Mon, 18 Jun 2018 18:17:44 +0000 (20:17 +0200)]
Fix a very nasty and sneaky bug in lib remap / static override code.

Not sure why remap call for static override reference ID pointer was put
there, probably a mistake during some merge back in the days...

But this ended up with self_id of libquery data struct still being set
to previous ID pointer, which could randomly generate crap like falsly
reporting indirect data and such, leading to lost reference datablock at
writefile time...

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: add rst
Campbell Barton [Mon, 18 Jun 2018 16:53:49 +0000 (18:53 +0200)]
editorconfig: add rst

3 years agoCleanup: use DEG tag flags, instead of old OB ones.
Bastien Montagne [Mon, 18 Jun 2018 16:42:42 +0000 (18:42 +0200)]
Cleanup: use DEG tag flags, instead of old OB ones.

Having those two in parallel is ratehr confusing... :/

3 years agoFix crash when making static override of an object from a collection.
Bastien Montagne [Mon, 18 Jun 2018 16:40:54 +0000 (18:40 +0200)]
Fix crash when making static override of an object from a collection.

Since we free collection caches when we remap one of their objects, we
also need to tell depsgraph to flush this into the COWs of that
collection, otherwise things like draw code can access freed memory...

3 years ago3D View: don't show manipulators when overlay is disabled
Campbell Barton [Mon, 18 Jun 2018 16:33:02 +0000 (18:33 +0200)]
3D View: don't show manipulators when overlay is disabled

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:22:06 +0000 (18:22 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: add line length, glsl
Campbell Barton [Mon, 18 Jun 2018 16:21:35 +0000 (18:21 +0200)]
editorconfig: add line length, glsl

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:12:04 +0000 (18:12 +0200)]
Merge branch 'master' into blender2.8

3 years agoAdd .editorconfig file
Campbell Barton [Mon, 18 Jun 2018 16:09:45 +0000 (18:09 +0200)]
Add .editorconfig file

This is a fairly well supported file-type configuration
for indentation and trailing space stripping.

See editorconfig.org for details.

3 years agoAvoid assert on startup
Campbell Barton [Mon, 18 Jun 2018 15:39:35 +0000 (17:39 +0200)]
Avoid assert on startup

3 years agoCleanup: redundant greater than
Campbell Barton [Mon, 18 Jun 2018 15:39:19 +0000 (17:39 +0200)]
Cleanup: redundant greater than

3 years agoParticle: Add missing field initializaiton
Sergey Sharybin [Mon, 18 Jun 2018 14:01:13 +0000 (16:01 +0200)]
Particle: Add missing field initializaiton

3 years agoUI: decorators hid non-array buttons
Campbell Barton [Mon, 18 Jun 2018 13:50:21 +0000 (15:50 +0200)]
UI: decorators hid non-array buttons

Error in last commit.

3 years agoStudiolights: Radiance icons were inverted.
Jeroen Bakker [Mon, 18 Jun 2018 13:45:55 +0000 (15:45 +0200)]
Studiolights: Radiance icons were inverted.

3 years agoWorkbench: increased Quality of the diffuse lighting model
Jeroen Bakker [Mon, 18 Jun 2018 13:17:46 +0000 (15:17 +0200)]
Workbench: increased Quality of the diffuse lighting model

- implemented Spherical Harmonics L2 for diffuse shading.

TODO: caching the precalculated harmonics so it won't take soo long to
open the popover

3 years agoObjects: when active object gets hidden, make it inactive.
Brecht Van Lommel [Mon, 18 Jun 2018 12:46:56 +0000 (14:46 +0200)]
Objects: when active object gets hidden, make it inactive.

3 years agoCleanup: simplify some view layer code.
Brecht Van Lommel [Mon, 18 Jun 2018 12:45:39 +0000 (14:45 +0200)]
Cleanup: simplify some view layer code.

3 years agoParticles: Remove obsolete code for child particles in edit mode
Sergey Sharybin [Mon, 18 Jun 2018 13:13:28 +0000 (15:13 +0200)]
Particles: Remove obsolete code for child particles in edit mode

3 years agoUI: decorators weren't showing icon-only buttons
Campbell Barton [Mon, 18 Jun 2018 13:11:10 +0000 (15:11 +0200)]
UI: decorators weren't showing icon-only buttons

3 years agoFix merge error in bpy_driver.c
Campbell Barton [Mon, 18 Jun 2018 13:09:55 +0000 (15:09 +0200)]
Fix merge error in bpy_driver.c

3 years agoUI: No decorators on render engine picker
Pablo Vazquez [Mon, 18 Jun 2018 10:41:31 +0000 (12:41 +0200)]
UI: No decorators on render engine picker

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Mon, 18 Jun 2018 10:32:12 +0000 (12:32 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_space.c

3 years agoFix T55503: File browser filter not working correctly.
Bastien Montagne [Mon, 18 Jun 2018 10:26:47 +0000 (12:26 +0200)]
Fix T55503: File browser filter not working correctly.

There were two issues here, introduced by rB66aa4af836:
* Forgot to change length of some filter_glob var deep in filebrowser code.
* Truncating filter_glob in general can be dangerous, generating
unexpected patterns.

Last point was the root of the issue here, truncating to 63 chars string
left last group as 'match everything' `*` pattern.

To fix that to some extent, added a new BLI_path_extension_glob_validate
helper to BLI_path_util, which ensures we do not have last
wildcards-only group in our pattern, when there are more than one group.

3 years agoUI: Start UIList with 2 rows for materials/particles
Pablo Vazquez [Mon, 18 Jun 2018 10:20:58 +0000 (12:20 +0200)]
UI: Start UIList with 2 rows for materials/particles

There is room for it anyway because of the 3 buttons on the right.

3 years agoMultires: Remove unused function
Sergey Sharybin [Mon, 18 Jun 2018 09:14:00 +0000 (11:14 +0200)]
Multires: Remove unused function

It uses derived mesh, and relies on scene stored in modifier data.
So port is needed anyway.

3 years agoDepsgraph: Cleamup, reduce indentation level
Sergey Sharybin [Mon, 18 Jun 2018 07:52:58 +0000 (09:52 +0200)]
Depsgraph: Cleamup, reduce indentation level

3 years ago3D View: support outline overlay option
Campbell Barton [Mon, 18 Jun 2018 07:22:58 +0000 (09:22 +0200)]
3D View: support outline overlay option

3 years agoRefactor: Put ViewportAA as UserPref
Jeroen Bakker [Mon, 18 Jun 2018 06:51:29 +0000 (08:51 +0200)]
Refactor: Put ViewportAA as UserPref

By default users want AA in the viewport. For slower systems you want to
be able to turn it off. As in the future we would also like to support
TAA in the viewport we introduced it as a Max Viewport AA settings.

Also removed the drawoption to enable/disable AA per viewport
When rendering the AA is always turned on.

3 years agoShadingMenu: Splitted in SubPanels
Jeroen Bakker [Mon, 18 Jun 2018 06:15:29 +0000 (08:15 +0200)]
ShadingMenu: Splitted in SubPanels

3 years agoFix T55511: Decorator drag makes many undo steps
Campbell Barton [Mon, 18 Jun 2018 06:25:05 +0000 (08:25 +0200)]
Fix T55511: Decorator drag makes many undo steps

Each keyframe made a separate undo step.

3 years agoCleanup: indentation
Campbell Barton [Mon, 18 Jun 2018 06:10:23 +0000 (08:10 +0200)]
Cleanup: indentation

3 years agoCleanup: whitespace
Campbell Barton [Mon, 18 Jun 2018 06:08:08 +0000 (08:08 +0200)]
Cleanup: whitespace

3 years agoFix T55517: Property-split fails w/ expanded enum
Campbell Barton [Mon, 18 Jun 2018 05:52:17 +0000 (07:52 +0200)]
Fix T55517: Property-split fails w/ expanded enum

3 years agoUI: disable decorators for render output
Campbell Barton [Mon, 18 Jun 2018 05:38:06 +0000 (07:38 +0200)]
UI: disable decorators for render output

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 05:34:31 +0000 (07:34 +0200)]
Merge branch 'master' into blender2.8

3 years agoRNA: disable animation for file output options
Campbell Barton [Mon, 18 Jun 2018 05:31:21 +0000 (07:31 +0200)]
RNA: disable animation for file output options

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