blender.git
12 months agoJoin the python modules `gpu` and `_gpu` into one.
mano-wii [Thu, 6 Sep 2018 00:10:42 +0000 (21:10 -0300)]
Join the python modules `gpu` and `_gpu` into one.

Maybe it's still early to set the new drawing api for python.
But joining these two modules is an initial step.

```
>>> gpu.
        matrix
        select
        types
```
```
>>> gpu.types.GPU
                 Batch(
                 OffScreen(
                 VertBuf(
                 VertFormat(
```
The creation of a new offscreen object is now done by the `GPUOffscreen.__new__` method.

Reviewers: campbellbarton, dfelinto

Reviewed By: campbellbarton, dfelinto

Tags: #bf_blender_2.8

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

12 months agoMulti-Objects: UV_OT_follow_active_quads
Dalai Felinto [Wed, 5 Sep 2018 22:25:56 +0000 (19:25 -0300)]
Multi-Objects: UV_OT_follow_active_quads

Starring: the overengineered error report system to make sure only one error
is reported.

12 months agoMulti-Objects: UV_OT_remove_doubles
Alan [Wed, 5 Sep 2018 20:33:07 +0000 (17:33 -0300)]
Multi-Objects: UV_OT_remove_doubles

Use kdtree for doubles (old standing TODO for this operator).

Small changes from reviewer (Dalai Felinto):
* Code style ({ is in a new line only if it is a two-line if).
* Skip objetcs loops when we know for sure nothing is selected (or all is)

https://developer.blender.org/D3441

12 months agoFix error message from MESH_OT_faces_mirror_uv
Dalai Felinto [Wed, 5 Sep 2018 20:31:04 +0000 (17:31 -0300)]
Fix error message from MESH_OT_faces_mirror_uv

Reported/Patch by Alan Troth.

12 months agoUV_OT_lightmap_pack: Distinction between edit and object modes
Dalai Felinto [Wed, 5 Sep 2018 20:20:33 +0000 (17:20 -0300)]
UV_OT_lightmap_pack: Distinction between edit and object modes

I don't even know why this operator was ever made to work in object mode.
That said, since it does, we should have different options for it
(or rather, always do all faces for it).

12 months agoMulti-Objects: UV_OT_lightmap_pack
Dalai Felinto [Wed, 5 Sep 2018 19:51:25 +0000 (16:51 -0300)]
Multi-Objects: UV_OT_lightmap_pack

I removed the All Objects option. This doesn't make more sense now that
all the selected objects will be in edit mesh mode.

12 months agoCleanup: uvcalc_smart_project.py 2/2
Dalai Felinto [Wed, 5 Sep 2018 18:36:31 +0000 (15:36 -0300)]
Cleanup: uvcalc_smart_project.py 2/2

12 months agoCleanup: uvcalc_smart_project.py
Dalai Felinto [Wed, 5 Sep 2018 18:26:29 +0000 (15:26 -0300)]
Cleanup: uvcalc_smart_project.py

Removing old commented out code. It includes progress bar and other bits
that were never implemented for this script since the 2.5 transition.

12 months agoMulti-Objects: UV_OT_smart_project
Dalai Felinto [Wed, 5 Sep 2018 18:23:39 +0000 (15:23 -0300)]
Multi-Objects: UV_OT_smart_project

12 months agoMulti-Objects: UV_OT_snap_selected
Dalai Felinto [Wed, 5 Sep 2018 18:02:19 +0000 (15:02 -0300)]
Multi-Objects: UV_OT_snap_selected

12 months agoFix T56657: Crash when creating a collection instance containing probes
Clément Foucault [Wed, 5 Sep 2018 17:32:12 +0000 (19:32 +0200)]
Fix T56657: Crash when creating a collection instance containing probes

12 months agoEdit Mesh: Add back the option to not highlight selected faces/edges
Clément Foucault [Wed, 5 Sep 2018 17:00:00 +0000 (19:00 +0200)]
Edit Mesh: Add back the option to not highlight selected faces/edges

Do note that we force showing the face dot if we are in face select mode
but faces and edges overlays are disable to not loose the selected faces
entirely.

12 months agoUI: Change "Show Edge Seams" toggle position
Clément Foucault [Wed, 5 Sep 2018 15:07:32 +0000 (17:07 +0200)]
UI: Change "Show Edge Seams" toggle position

12 months agoCleanup: Remove unnecessary uniform
Clément Foucault [Wed, 5 Sep 2018 15:02:23 +0000 (17:02 +0200)]
Cleanup: Remove unnecessary uniform

12 months agoEdit Mesh: Add support for draw option parameters
Clément Foucault [Wed, 5 Sep 2018 15:02:00 +0000 (17:02 +0200)]
Edit Mesh: Add support for draw option parameters

The visuals was already implemented but we could not toggle them off.

12 months agoFix T56692: The edges are not highlighted in Mark Freestyle Edge
Clément Foucault [Wed, 5 Sep 2018 13:42:32 +0000 (15:42 +0200)]
Fix T56692: The edges are not highlighted in Mark Freestyle Edge

This was not ported yet.

12 months agoFix GPU.offscreen to use depsgraph and updated API
Dalai Felinto [Wed, 5 Sep 2018 15:50:33 +0000 (12:50 -0300)]
Fix GPU.offscreen to use depsgraph and updated API

12 months agoMulti-Objects: UV_OT_align and UV_OT_weld
Dalai Felinto [Wed, 5 Sep 2018 14:18:31 +0000 (11:18 -0300)]
Multi-Objects: UV_OT_align and UV_OT_weld

12 months agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 5 Sep 2018 14:05:43 +0000 (16:05 +0200)]
Merge branch 'master' into blender2.8

12 months agoCCG: Remove number of layers from key
Sergey Sharybin [Wed, 5 Sep 2018 13:56:50 +0000 (15:56 +0200)]
CCG: Remove number of layers from key

The issue there was that number of layers did not include normals,
while element size counts bytes used by normals. This sounds very
fragile and dangerous to work further. Also, one value can easily
be delivered from another, so it is redundancy going on here.

Possible difference now is that multires subdivision will copy
normals to a higher levels. Shouldn't be big of a problem, since
leaving old normals and updating coordinates is not correct either.

12 months agoFix for text alignment on multiple text boxes
Dalai Felinto [Wed, 5 Sep 2018 13:01:08 +0000 (10:01 -0300)]
Fix for text alignment on multiple text boxes

The original code was already making a distinction between lines in the last
text box and all lines. However I removed that bit since when I tested the
values were the same (I tested with a single text box).

Bringing this distinction back.

Not addressed here: All boxes should respect the alignment. Which at the moment
they don't seem to fully do.

12 months agoUI: remove delete redo panel
Campbell Barton [Wed, 5 Sep 2018 08:01:55 +0000 (18:01 +1000)]
UI: remove delete redo panel

Since the option is now hidden from the UI, add to the object menu
(without this the key binding isn't discoverable).

12 months agoUI: hide mesh mode element redo panel
Campbell Barton [Wed, 5 Sep 2018 07:58:14 +0000 (17:58 +1000)]
UI: hide mesh mode element redo panel

12 months agoUI: use grid flow for Cycles object settings.
William Reynish [Wed, 5 Sep 2018 11:43:04 +0000 (13:43 +0200)]
UI: use grid flow for Cycles object settings.

12 months agoFix T56695: Selecting an occluded object in xray causes crash
Clément Foucault [Wed, 5 Sep 2018 10:53:14 +0000 (12:53 +0200)]
Fix T56695: Selecting an occluded object in xray causes crash

12 months agoGP: Set first color as default when create new Stroke or Monkey
Antonioya [Wed, 5 Sep 2018 09:37:54 +0000 (11:37 +0200)]
GP: Set first color as default when create new Stroke or Monkey

12 months agokeyingsets_builtins: use keyword parameters
Sybren A. Stüvel [Wed, 5 Sep 2018 09:00:57 +0000 (11:00 +0200)]
keyingsets_builtins: use keyword parameters

12 months agoUI: tweak tooltip placement
Campbell Barton [Wed, 5 Sep 2018 07:10:59 +0000 (17:10 +1000)]
UI: tweak tooltip placement

Only apply offset w/ non overlapping placement.

12 months agoCorrect last commit (keep same location as brushes)
Campbell Barton [Wed, 5 Sep 2018 06:05:00 +0000 (16:05 +1000)]
Correct last commit (keep same location as brushes)

12 months agoTool System: show weight for the gradient tool
Campbell Barton [Wed, 5 Sep 2018 06:01:53 +0000 (16:01 +1000)]
Tool System: show weight for the gradient tool

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 5 Sep 2018 05:01:58 +0000 (15:01 +1000)]
Merge branch 'master' into blender2.8

12 months agoCleanup: replace doxy @ with backslash
Campbell Barton [Wed, 5 Sep 2018 04:56:29 +0000 (14:56 +1000)]
Cleanup: replace doxy @ with backslash

The rest of Blender uses backslashes.

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 5 Sep 2018 04:48:18 +0000 (14:48 +1000)]
Merge branch 'master' into blender2.8

12 months agoCleanup: style
Campbell Barton [Wed, 5 Sep 2018 04:46:54 +0000 (14:46 +1000)]
Cleanup: style

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 5 Sep 2018 04:34:25 +0000 (14:34 +1000)]
Merge branch 'master' into blender2.8

12 months agoFix T54152: --env-system-scripts fails on win32
Ray Molenkamp [Wed, 5 Sep 2018 04:31:10 +0000 (14:31 +1000)]
Fix T54152: --env-system-scripts fails on win32

12 months agoUI: avoid comma which can be used in shortcuts
Campbell Barton [Wed, 5 Sep 2018 04:03:28 +0000 (14:03 +1000)]
UI: avoid comma which can be used in shortcuts

12 months agoUI: show a small label next to the tool
Campbell Barton [Wed, 5 Sep 2018 03:52:19 +0000 (13:52 +1000)]
UI: show a small label next to the tool

Instead of showing the full tip immediately when hovering over a tool,
show only the (label, shortcut), without suppressing the regular tip.

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 5 Sep 2018 02:14:53 +0000 (12:14 +1000)]
Merge branch 'master' into blender2.8

12 months agoFix VSE cut both-sides option
Campbell Barton [Wed, 5 Sep 2018 01:56:31 +0000 (11:56 +1000)]
Fix VSE cut both-sides option

Was ignoring the option, using the mouse in all cases.

D3671 by @ISS w/ edits.

12 months ago3D Text: improvements to vertical alignment
Dalai Felinto [Wed, 5 Sep 2018 01:21:12 +0000 (11:21 +1000)]
3D Text: improvements to vertical alignment

They way Blender handles vertical alignment is very buggy:

- Top-Base: It works perfectly.

- Bottom: It is actually bottom-baseline,
  and it fails when line size is != 1.0 when working with text boxes.

- Top: Poorly implemented, it should use font's ascent
  (recommended distance from baseline),
  so it has room for accents,
  but it's not one line distance far from the origin (as it is now).

- Center: Poorly implemented.
  This is tricky since there is no silver bullet.

To clear this situation I created a new option (Bottom-Baseline),
and addressed the issues above.
I'm getting the ascent and descent from freetype2,
and use this for padding above/below the text.
Also for vertically centering the text.

12 months agoUI: hide brush select redo panel
Campbell Barton [Tue, 4 Sep 2018 23:33:46 +0000 (09:33 +1000)]
UI: hide brush select redo panel

12 months agoMerge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8

12 months agocycles: Fix x86 build error.
Ray Molenkamp [Tue, 4 Sep 2018 22:58:41 +0000 (16:58 -0600)]
cycles: Fix x86 build error.

WITH_CYCLES_CUDA_BINARIES was set as a regular variable causing it to be overwritten by the release.cmake settings.

12 months agoCleanup: style
Campbell Barton [Tue, 4 Sep 2018 22:54:11 +0000 (08:54 +1000)]
Cleanup: style

12 months agoCorrect edge rip tool operator
Campbell Barton [Tue, 4 Sep 2018 22:45:46 +0000 (08:45 +1000)]
Correct edge rip tool operator

12 months agoMulti-Objects: MESH_OT_faces_mirror_uv
Alan [Tue, 4 Sep 2018 19:35:03 +0000 (16:35 -0300)]
Multi-Objects: MESH_OT_faces_mirror_uv

Changes from reviewer (Dalai Felinto):
* pep8.
* Skip meshes that come from libraries.
* `Copy Mirrored UV coords > Copy Mirrored UV Coords`.
* Remove mesh(es) from warnings, report mesh or meshes based on number.

https://developer.blender.org/D3529

12 months agoFix T56524: Navigate Gizmo obscured by objects in orthographic view
Clément Foucault [Tue, 4 Sep 2018 20:25:42 +0000 (22:25 +0200)]
Fix T56524: Navigate Gizmo obscured by objects in orthographic view

12 months agoGP: Reorder Viewport Display panel options
Antonioya [Tue, 4 Sep 2018 20:10:56 +0000 (22:10 +0200)]
GP: Reorder Viewport Display panel options

12 months agoMulti-Objects: UV_OT_seams_from_islands
Dalai Felinto [Tue, 4 Sep 2018 19:27:16 +0000 (16:27 -0300)]
Multi-Objects: UV_OT_seams_from_islands

12 months agoMulti-Objects: UV_OT_minimize_stretch
Alan [Tue, 4 Sep 2018 17:24:41 +0000 (14:24 -0300)]
Multi-Objects: UV_OT_minimize_stretch

Changes from Reviewer (Dalai Felinto):
* MEM_SAFE_FREE > MEM_freeN.
* Skip loop if sync selection and no face selected.

https://developer.blender.org/D3415

12 months agoUI: icon keyword argument to popmenu_begin__internal
Aleksandr Zinovev [Tue, 4 Sep 2018 17:32:34 +0000 (20:32 +0300)]
UI: icon keyword argument to popmenu_begin__internal

12 months agoMulti-Objects: UV_OT_average_islands_scale
Alan [Tue, 4 Sep 2018 17:06:54 +0000 (14:06 -0300)]
Multi-Objects: UV_OT_average_islands_scale

Changes from reviewer (Dalai Felinto):
* Skip loop if sync selection and no vertex selected.

https://developer.blender.org/D3406

12 months agoMulti object editing - UV_OT_mark_seam
Alan [Tue, 4 Sep 2018 16:45:08 +0000 (13:45 -0300)]
Multi object editing - UV_OT_mark_seam

Changes from reviewer (Dalai Felinto):
* MEM_SAFE_FREE > MEM_freeN.
* Skip loop if sync selection and no edge selected.

https://developer.blender.org/D3417

12 months agoMulti-Objects: UV_OT_select_split
Dalai Felinto [Tue, 4 Sep 2018 15:18:59 +0000 (12:18 -0300)]
Multi-Objects: UV_OT_select_split

12 months agoFix T56686: Crash when copy and paste Annotations
Antonioya [Tue, 4 Sep 2018 15:16:14 +0000 (17:16 +0200)]
Fix T56686: Crash when copy and paste Annotations

Annotations are not designed to edit, copy or paste, so the operators must be disabled.

By design annotations can only be added or deleted, but not edited.

Still pending clean the pie menus, but this will be done during UI cleanup.

12 months agoXray: Add possibility to select wires in priority before surfaces
Clément Foucault [Tue, 4 Sep 2018 15:14:46 +0000 (17:14 +0200)]
Xray: Add possibility to select wires in priority before surfaces

If no wires were found, try to select surfaces in a second loop.

12 months agoFix T56682: GP Edit mode, deselected vertices not visible
Antonioya [Tue, 4 Sep 2018 14:59:14 +0000 (16:59 +0200)]
Fix T56682: GP Edit mode, deselected vertices not visible

12 months agoMulti object edit: UV_OT_select_less & UV_OT_select_more
Alan [Tue, 4 Sep 2018 14:35:54 +0000 (11:35 -0300)]
Multi object edit: UV_OT_select_less & UV_OT_select_more

https://developer.blender.org/D3387

12 months agoMulti-Objects: UV_OT_circle_select
Dalai Felinto [Tue, 4 Sep 2018 14:27:02 +0000 (11:27 -0300)]
Multi-Objects: UV_OT_circle_select

Although this was marked as done, it wasn't, I'm glad I caught it.
Based entirely on the uv border select operator.

12 months agoCleanup: remove legacy layer and dupli code.
Brecht Van Lommel [Tue, 4 Sep 2018 13:08:57 +0000 (15:08 +0200)]
Cleanup: remove legacy layer and dupli code.

12 months agoMulti-Objects: UV_OT_pin
Dalai Felinto [Tue, 4 Sep 2018 14:00:43 +0000 (11:00 -0300)]
Multi-Objects: UV_OT_pin

Also introducing a way to skip the object loop when using synced selection.
I plan to use this for the upcoming operators too.

12 months agoMulti-Objects: UV_OT_select_pinned
Dalai Felinto [Tue, 4 Sep 2018 14:01:43 +0000 (11:01 -0300)]
Multi-Objects: UV_OT_select_pinned

Inspired by patch from Alan Troth, with minor changes
(codestyle and update to latest source code).

12 months agoSubdiv: Clarity resolution parameter
Sergey Sharybin [Tue, 4 Sep 2018 14:05:33 +0000 (16:05 +0200)]
Subdiv: Clarity resolution parameter

Was a bit misleading, since different ptex faces will be
tessellated at different resolution, depending whether they
are coming from quad or not.

12 months agoCorrect doxygen file headers
Sergey Sharybin [Tue, 4 Sep 2018 13:45:48 +0000 (15:45 +0200)]
Correct doxygen file headers

12 months agoSubdiv: Move mesh creation functionality to own header
Sergey Sharybin [Tue, 4 Sep 2018 13:32:01 +0000 (15:32 +0200)]
Subdiv: Move mesh creation functionality to own header

12 months agoSubdiv: Move evaluation functionality to own header
Sergey Sharybin [Tue, 4 Sep 2018 13:26:58 +0000 (15:26 +0200)]
Subdiv: Move evaluation functionality to own header

12 months agoSubdiv: Move FOREACH functionality to own header
Sergey Sharybin [Tue, 4 Sep 2018 13:22:36 +0000 (15:22 +0200)]
Subdiv: Move FOREACH functionality to own header

12 months agoSubsurf: Clarify what Subdiv structure is for
Sergey Sharybin [Tue, 4 Sep 2018 13:17:33 +0000 (15:17 +0200)]
Subsurf: Clarify what Subdiv structure is for

12 months agoFix T56679: Blender 2.8 crashes with bezier curve snap.
Bastien Montagne [Tue, 4 Sep 2018 12:30:25 +0000 (14:30 +0200)]
Fix T56679: Blender 2.8 crashes with bezier curve snap.

Follow up to rB621b16468ef72fb actually... Seriously... :/

12 months agoOpenSubdiv: Disable varying elements interpolation
Sergey Sharybin [Tue, 4 Sep 2018 10:38:54 +0000 (12:38 +0200)]
OpenSubdiv: Disable varying elements interpolation

We currently don't use those. Skipping creation of stencils for
them gives about 7% speedup of evaluation creation.

12 months agoCleanup: Typo in comment
Sergey Sharybin [Tue, 4 Sep 2018 10:30:06 +0000 (12:30 +0200)]
Cleanup: Typo in comment

12 months agoUI: keep no-overlap tips open on cursor motion
Campbell Barton [Tue, 4 Sep 2018 09:35:03 +0000 (19:35 +1000)]
UI: keep no-overlap tips open on cursor motion

Was causing flicker.

12 months agoCleanup: overly polite/rude messages
Campbell Barton [Tue, 4 Sep 2018 08:44:05 +0000 (18:44 +1000)]
Cleanup: overly polite/rude messages

12 months agoFix mistake in previous commit
Sergey Sharybin [Tue, 4 Sep 2018 08:22:33 +0000 (10:22 +0200)]
Fix mistake in previous commit

12 months agoFix error when no tool is active
Campbell Barton [Tue, 4 Sep 2018 08:30:22 +0000 (18:30 +1000)]
Fix error when no tool is active

12 months agoCleanup, indentation
Sergey Sharybin [Tue, 4 Sep 2018 08:21:26 +0000 (10:21 +0200)]
Cleanup, indentation

12 months agoFix assert creating a tools tip
Campbell Barton [Tue, 4 Sep 2018 08:15:25 +0000 (18:15 +1000)]
Fix assert creating a tools tip

12 months agoUI: support immediate non-overlapping tooltips
Campbell Barton [Tue, 4 Sep 2018 07:57:59 +0000 (17:57 +1000)]
UI: support immediate non-overlapping tooltips

Use these for the toolbar, since they're non-overlapping the interface,
showing them quickly isn't a problem.

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 4 Sep 2018 07:34:46 +0000 (17:34 +1000)]
Merge branch 'master' into blender2.8

12 months agoCleanup: use const arg for BLI_rect inside check
Campbell Barton [Tue, 4 Sep 2018 07:33:12 +0000 (17:33 +1000)]
Cleanup: use const arg for BLI_rect inside check

12 months agoFix T56675: Crash when snapping Cursor to selected a Bone in Edit Mode.
Bastien Montagne [Tue, 4 Sep 2018 07:12:54 +0000 (09:12 +0200)]
Fix T56675: Crash when snapping Cursor to selected a Bone in Edit Mode.

Seriously...

12 months agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 4 Sep 2018 05:29:27 +0000 (15:29 +1000)]
Merge branch 'master' into blender2.8

12 months agoUI: cleanup tooltip bounds clamping
Campbell Barton [Tue, 4 Sep 2018 05:23:39 +0000 (15:23 +1000)]
UI: cleanup tooltip bounds clamping

Wasn't properly clamping on the window minimum.

12 months agoUI: show tool name in tip w/ icon-only display
Campbell Barton [Tue, 4 Sep 2018 04:37:19 +0000 (14:37 +1000)]
UI: show tool name in tip w/ icon-only display

12 months agoFix T56660: Use horizontal enums w/ image template
Campbell Barton [Tue, 4 Sep 2018 04:09:45 +0000 (14:09 +1000)]
Fix T56660: Use horizontal enums w/ image template

12 months agoUI: use horizontal alignment for expanded enums
Campbell Barton [Tue, 4 Sep 2018 04:07:26 +0000 (14:07 +1000)]
UI: use horizontal alignment for expanded enums

With the property separate option, the direction of expanded enums
now follows the current layout.

12 months agoCleanup: pep8
Campbell Barton [Mon, 3 Sep 2018 22:50:00 +0000 (08:50 +1000)]
Cleanup: pep8

12 months agoCorrect toolbar tips for non sculpt modes
Campbell Barton [Mon, 3 Sep 2018 22:09:48 +0000 (08:09 +1000)]
Correct toolbar tips for non sculpt modes

12 months agoUI: tweak object viewport display panel, use grid flow.
William Reynish [Mon, 3 Sep 2018 17:33:23 +0000 (19:33 +0200)]
UI: tweak object viewport display panel, use grid flow.

12 months agoUI: use grid flow for metadata panel.
William Reynish [Mon, 3 Sep 2018 16:34:02 +0000 (18:34 +0200)]
UI: use grid flow for metadata panel.

12 months agoFix T56544: Crash on startup with Radeon + Win 7
Clément Foucault [Mon, 3 Sep 2018 17:20:56 +0000 (19:20 +0200)]
Fix T56544: Crash on startup with Radeon + Win 7

Testing GLEW_ARB_texture_gather is not sufficient in this case. We need to
test if GL_ARB_texture_gather is defined in the shader, which is always true
on some NVIDIA drivers who does not support it...
So trying to make everything work.

12 months agoUI: reorganize render output and encoding panels for single columns.
William Reynish [Mon, 3 Sep 2018 15:23:48 +0000 (17:23 +0200)]
UI: reorganize render output and encoding panels for single columns.

This will look a bit better once horizontal expanded enums work.

12 months agoFix T56667: missing sockets with Cycles render layer nodes in compositing.
Brecht Van Lommel [Mon, 3 Sep 2018 15:16:17 +0000 (17:16 +0200)]
Fix T56667: missing sockets with Cycles render layer nodes in compositing.

12 months agoMerge branch 'master' into blender2.8
Bastien Montagne [Mon, 3 Sep 2018 15:44:36 +0000 (17:44 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/collision.c

12 months agoClosthCollision: fully avoid computing BVHTree when we have no collision objects...
Bastien Montagne [Mon, 3 Sep 2018 15:32:46 +0000 (17:32 +0200)]
ClosthCollision: fully avoid computing BVHTree when we have no collision objects to test against.

Followup to rBc6bbe6c5aac29, much more elegant solution to the problem. ;)

12 months agoFix T56423: Fully broken drag'n'drop parenting in Outliner.
Bastien Montagne [Mon, 3 Sep 2018 15:24:26 +0000 (17:24 +0200)]
Fix T56423: Fully broken drag'n'drop parenting in Outliner.

`BKE_libblock_find_name()` expects ID names *without* ID type 'prefix'...

12 months agoCleanup: Split function up
Sergey Sharybin [Mon, 3 Sep 2018 15:06:50 +0000 (17:06 +0200)]
Cleanup: Split function up

We would need to at least support one more PBVH building
here, trying to squeeze everything into one function will
make it really hard to read and follow.

12 months agoSpelling fixes in comments and descriptions, patch by luzpaz.
Brecht Van Lommel [Mon, 3 Sep 2018 14:49:08 +0000 (16:49 +0200)]
Spelling fixes in comments and descriptions, patch by luzpaz.

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

12 months agoFix T56622: crash and other bugs deleting scenes.
Brecht Van Lommel [Fri, 31 Aug 2018 14:14:20 +0000 (16:14 +0200)]
Fix T56622: crash and other bugs deleting scenes.

Simplify library remapping code to handle special collection/object links
in postprocess. Previously base contained the actual object link which
needed special handling in preprocess, now objects are linked through
collection and the base cache can be updated in postprocess.