Campbell Barton [Sun, 17 Jun 2018 14:36:30 +0000 (16:36 +0200)]
Merge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 14:32:54 +0000 (16:32 +0200)]
Cleanup: trailing space for BLI
Campbell Barton [Sun, 17 Jun 2018 14:26:47 +0000 (16:26 +0200)]
Cleanup: remove unused BLI_rebase_path
Campbell Barton [Sun, 17 Jun 2018 14:18:15 +0000 (16:18 +0200)]
Merge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 14:13:24 +0000 (16:13 +0200)]
Cleanup: BLI path extension API
Use BLI_path_extension_* prefix.
Campbell Barton [Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)]
Merge branch 'master' into blender2.8
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.
Campbell Barton [Sun, 17 Jun 2018 12:50:42 +0000 (14:50 +0200)]
Driver: trailing zeros from expression
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.
Campbell Barton [Sun, 17 Jun 2018 10:38:28 +0000 (12:38 +0200)]
UI: hide decorators in panels w/o animated buttons
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.
Campbell Barton [Sun, 17 Jun 2018 10:08:33 +0000 (12:08 +0200)]
UI: correct decorator buttons 'enabled' flag
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).
Campbell Barton [Sun, 17 Jun 2018 10:03:22 +0000 (12:03 +0200)]
Cleanup: codestyle
Campbell Barton [Sun, 17 Jun 2018 09:57:49 +0000 (11:57 +0200)]
Merge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 09:56:20 +0000 (11:56 +0200)]
CMake: add missing headers
Campbell Barton [Sun, 17 Jun 2018 09:50:56 +0000 (11:50 +0200)]
Cleanup: use clamp_* from BLI_math (replace macro)
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
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
Clément Foucault [Sat, 16 Jun 2018 21:28:28 +0000 (23:28 +0200)]
Custom Hdri: Use same AntiAliasing as Matcaps
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.
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
Clément Foucault [Sat, 16 Jun 2018 20:32:58 +0000 (22:32 +0200)]
Matcaps: Add AntiAlias alpha mask to icon preview.
Clément Foucault [Sat, 16 Jun 2018 19:11:15 +0000 (21:11 +0200)]
Studio Light: Fix typo
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
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
Ray Molenkamp [Sat, 16 Jun 2018 18:30:56 +0000 (12:30 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Sat, 16 Jun 2018 18:29:38 +0000 (12:29 -0600)]
make.bat: Fix `make showhashes` not working.
broke in recent refactor.
Campbell Barton [Sat, 16 Jun 2018 16:26:34 +0000 (18:26 +0200)]
UI: show decorator icon for static-override
Bastien Montagne [Sat, 16 Jun 2018 16:02:50 +0000 (18:02 +0200)]
Merge branch 'master' into blender2.8
Bastien Montagne [Sat, 16 Jun 2018 16:02:02 +0000 (18:02 +0200)]
Cleanup: remove BLI_frand from GreasePencil code.
Campbell Barton [Sat, 16 Jun 2018 15:31:37 +0000 (17:31 +0200)]
Correct assert in recent changes
Campbell Barton [Sat, 16 Jun 2018 14:19:18 +0000 (16:19 +0200)]
UI: support dragging to key-frame
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
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...
Campbell Barton [Sat, 16 Jun 2018 14:16:53 +0000 (16:16 +0200)]
Merge branch 'master' into blender2.8
Campbell Barton [Sat, 16 Jun 2018 14:04:26 +0000 (16:04 +0200)]
UI: refactor drag-toggle for other button types
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.
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.
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.
Campbell Barton [Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)]
Merge branch 'master' into blender2.8
Lukas Stockner [Sat, 16 Jun 2018 11:47:49 +0000 (13:47 +0200)]
Cycles Cleanup: Remove unneccessary color management call
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
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.
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
Campbell Barton [Fri, 15 Jun 2018 19:05:49 +0000 (21:05 +0200)]
UI: fix redundant scrolling in the redo panel
Campbell Barton [Fri, 15 Jun 2018 18:55:37 +0000 (20:55 +0200)]
Cleanup: code style
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.
Campbell Barton [Fri, 15 Jun 2018 17:12:44 +0000 (19:12 +0200)]
Merge branch 'master' into blender2.8
Campbell Barton [Fri, 15 Jun 2018 17:09:43 +0000 (19:09 +0200)]
WM: suppress drag events if motion is handled
Bastien Montagne [Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)]
Merge branch 'master' into blender2.8
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...
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
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!
Bastien Montagne [Fri, 15 Jun 2018 15:33:24 +0000 (17:33 +0200)]
Cleanup: G.main removal from 2.8-only code.
Bastien Montagne [Fri, 15 Jun 2018 15:25:41 +0000 (17:25 +0200)]
Merge branch 'master' into blender2.8
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.
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 :)
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.
Bastien Montagne [Fri, 15 Jun 2018 15:21:07 +0000 (17:21 +0200)]
Cleanup: some more G.main removal/validation...
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.
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.
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.
Brecht Van Lommel [Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)]
Merge branch 'master' into blender2.8
Brecht Van Lommel [Fri, 15 Jun 2018 13:58:48 +0000 (15:58 +0200)]
Fix more Cycles CUDA errors after recent changes.
Dalai Felinto [Fri, 15 Jun 2018 13:44:14 +0000 (15:44 +0200)]
Fix T55443: Manipulators not refreshing
Campbell Barton [Fri, 15 Jun 2018 13:42:42 +0000 (15:42 +0200)]
Merge branch 'master' into blender28
Campbell Barton [Fri, 15 Jun 2018 13:42:31 +0000 (15:42 +0200)]
Cleanup: warning
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
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.
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).
Sybren A. Stüvel [Fri, 15 Jun 2018 08:45:08 +0000 (10:45 +0200)]
Converted Rigid Body from DerivedMesh to Mesh
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
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.
Jeroen Bakker [Fri, 15 Jun 2018 07:10:39 +0000 (09:10 +0200)]
T55486: use GPU_R11F_G11F_B10F for target of Xray compo
Jeroen Bakker [Fri, 15 Jun 2018 06:57:49 +0000 (08:57 +0200)]
T55486: use GPU_R11F_G11F_B10F for Matcaps
Campbell Barton [Fri, 15 Jun 2018 10:28:19 +0000 (12:28 +0200)]
Tool System: workaround click conflicting w/ add brush
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.
Philipp Oeser [Fri, 15 Jun 2018 08:44:33 +0000 (10:44 +0200)]
Merge branch 'master' into blender2.8
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
Brecht Van Lommel [Fri, 15 Jun 2018 08:06:32 +0000 (10:06 +0200)]
Fix Cycles CUDA error after recent changes.
Campbell Barton [Fri, 15 Jun 2018 08:25:41 +0000 (10:25 +0200)]
Merge branch 'master' into blender2.8
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
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
Campbell Barton [Fri, 15 Jun 2018 06:02:17 +0000 (08:02 +0200)]
Cleanup: unused var
Lukas Stockner [Thu, 14 Jun 2018 20:54:42 +0000 (22:54 +0200)]
Merge remote-tracking branch 'origin/master' into blender2.8
Lukas Stockner [Thu, 14 Jun 2018 20:46:30 +0000 (22:46 +0200)]
Image: Refactor render slots to a dynamic list
Previously, render slots were hardcoded to a fixed amount.
With this change, render slots now are stored in a list. Therefore, users can add and/or remove as many slots as they want.
Credit to brecht for the UI part.
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D3474
Campbell Barton [Thu, 14 Jun 2018 20:44:53 +0000 (22:44 +0200)]
Cleanup: style
Campbell Barton [Thu, 14 Jun 2018 20:32:01 +0000 (22:32 +0200)]
WM: fix redo region setting the context
Campbell Barton [Thu, 14 Jun 2018 20:27:58 +0000 (22:27 +0200)]
WM: add support for temporary region data
Lukas Stockner [Thu, 14 Jun 2018 15:48:19 +0000 (17:48 +0200)]
Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB
I've limited it to just the RGB<->XYZ stuff for now, correct image handling is the next step.
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D3478
Lukas Stockner [Thu, 14 Jun 2018 20:16:42 +0000 (22:16 +0200)]
Cycles: Connect value inputs to Strength instead of Color when inserting an Emission node
Same result, but saves an additional ConvertNode.
Lukas Stockner [Thu, 14 Jun 2018 14:18:34 +0000 (16:18 +0200)]
Cycles: Automatically detect HDRI resolution by default and use non-square sampling map
The automatic mode checks all Enviroment Texture nodes and picks the largest image's resolution.
If there are no Enviroment Textures, it just uses the old default.
Also, the sampling map now isn't limited to square shapes. The automatic detection uses the exact image size,
the manual UI option now halves the value to get the height.
A default aspect ratio of 2:1 makes sense since this is what most HDRIs use.
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D3477
Campbell Barton [Thu, 14 Jun 2018 19:55:40 +0000 (21:55 +0200)]
WM: revert part of Top-Bar inclusion
This removes OperatorRepeatContextHandle, from
5f6c45498c92b
since we now only have redo in the area an operator is executed in.
These values could be invalid and crashed in some cases.
Clément Foucault [Thu, 14 Jun 2018 19:45:02 +0000 (21:45 +0200)]
Edit Mesh: Fix blending function of edges
This fix the ugly (usually) dark outline that was around selected edges.
Brecht Van Lommel [Thu, 14 Jun 2018 18:53:39 +0000 (20:53 +0200)]
Fix motion paths not updating correctly for bones in some cases.
Sometimes the evaluated pose channel pointers can change during depsgraph
evaluation, so we can't store them ahead of time. The object pointer
should be ok since evaluated ID memory is reused.
Clément Foucault [Thu, 14 Jun 2018 16:14:17 +0000 (18:14 +0200)]
Revert "GHOST: GLX: Remove XInitThreads"
This reverts commit
7529690df38ced314d59af3b10c610e3fd56c807.
I tried to put manually add threading protection to GHOST around
Xlib calls but that did not fix the crashes. So reverting that
for now despite the performance implication on some system.
Clément Foucault [Thu, 14 Jun 2018 14:20:23 +0000 (16:20 +0200)]
Preview: Add own opengl context to render preview images.
Sybren A. Stüvel [Thu, 14 Jun 2018 15:34:01 +0000 (17:34 +0200)]
Give RigidBodyWorld collection a fake user
This prevents it from disappearing when the blend file is saved.
Campbell Barton [Thu, 14 Jun 2018 14:47:39 +0000 (16:47 +0200)]
UI: redo panel would still start zoomed in at times