4fe578c827
Merge branch 'master' into blender2.8
2018-12-07 15:00:48 +01:00
3b1f90ed84
Cycles: Do more user-friendly indication that GPU devices are not found
2018-12-07 14:53:29 +01:00
bb0d812d98
Cycles: Disable OpenCL on macOS
...
This is unfortunate, but the number of bugs in this configuration
keeps growing, and almost all of them are caused by bug in OpenCL
compiler.
The compiler is not likely to be fixed, since Apple declared OpenCL
deprecated.
This evil commit is aimed to keep officially supported features
of Blender in a good working and stable state.
2018-12-07 14:37:47 +01:00
cc61b21dff
Partial fix to T58917 - No valid cage
...
The fix itself simply is to store the cage object as a pointer instead
of a string/name.
That said baking with or without cage is yielding very different results
than in 2.7.
2018-12-07 10:44:19 -02:00
606223f6a6
Merge branch 'master' into blender2.8
2018-12-07 15:54:17 +11:00
d40bffa17f
UI: add material settings in shader editor sidebar.
...
Differential Revision: https://developer.blender.org/D3926
2018-12-07 00:57:20 +01:00
cccc40db51
Fix T57963: Cycles crash using AO for displacement.
...
Note this is not supported, there exists no geometry at this point, but
it should not crash at least.
2018-12-06 19:50:05 +01:00
0e5f97a3a1
Fix T58816: Color management Display Device other than sRGB crashes
...
This fixes our workaround for until proper solution is accepted
in upstream.
Now, when default view behaves same as it was supposed to (and
as it behaves in OCIO-1.0.9) it is obvious that our configuration
violates own design -- default view is used for cases when
images don't want to be displays using "render" settings.
2018-12-06 10:55:31 +01:00
a60536956e
Color management: Fix issue when active views/displays are not specified
2018-12-06 09:16:52 +01:00
5584cad5d9
GHOST: WGL: Silence Errors when testing opengl context versions
2018-12-05 21:57:49 +01:00
a3b03b8146
Merge branch 'master' into blender2.8
2018-12-05 15:15:06 +01:00
834fa06614
Fix (unreported) building Cycles tests with Embree enabled.
2018-12-05 15:14:16 +01:00
fb3f1a3567
Merge branch 'master' into blender2.8
2018-12-05 14:41:00 +01:00
6122e1d6c0
Color management: Fix/workaround broken getDefaultDisplay()
...
This is something what is caused by OCIO library. The patch
has been submitted there:
https://github.com/imageworks/OpenColorIO/pull/638
For until it is refined and checked we do workaround from
our side.
2018-12-05 14:11:21 +01:00
c9344d6c5b
Fix T58776, T58030: pressure sensitivity on Linux not working for some tablets.
2018-12-05 14:02:37 +01:00
4a21345665
Merge branch 'master' into blender2.8
2018-12-05 12:54:45 +01:00
f5b46daf52
Fix build with old CMake versions.
2018-12-05 12:53:19 +01:00
5c3955452b
Merge branch 'master' into blender2.8
2018-12-04 19:48:21 +01:00
8908670623
Fix T58466: bug in macOS GHOST_GetSwapInterval.
...
No user level changes since this function is not used in active code.
2018-12-04 18:44:42 +01:00
b9b88d59dd
Merge branch 'master' into blender2.8
2018-12-04 16:35:16 +01:00
f63da3dcf5
Buildbot: enable support for NVIDIA Turing cards in Cycles (like GTX 20xx).
...
We currently only build the sm_7x kernels with CUDA 10.0, older cards still
use 9.1 until rendering errors are solved for them.
2018-12-04 16:03:18 +01:00
b14ec18601
Cycles: add initial CUDA 10.0 support, but only recommend use for Turing cards.
...
There may still be rendering errors when used for older graphics cards.
2018-12-04 16:03:18 +01:00
df2635099b
Merge branch 'master' into blender2.8
2018-12-04 11:45:22 +01:00
5a6f1fa563
Fix T58600: update OSL scripts to work with OSL 1.10.x.
2018-12-03 15:14:21 +01:00
394b086b9c
Fix T58556: Some remaining 'dupli_types' in pycode after renaming.
2018-12-03 10:39:54 +01:00
0f5b53ba4d
Revert "Win32: Use the nicer looking blender-drawn confirmation message box when"
...
This reverts commit 60d6eb0b5d
2018-11-30 23:29:32 +01:00
60d6eb0b5d
Win32: Use the nicer looking blender-drawn confirmation message box when
...
quitting with unsaved changes, instead of an ugly messagebox
2018-11-30 21:11:59 +01:00
cb8afaf5db
Merge branch 'master' into blender2.8
2018-11-30 17:07:59 +11:00
6e253fc627
Correct missing semicolon in recent commit
2018-11-30 17:07:13 +11:00
63c0653170
Merge branch 'master' into blender2.8
2018-11-29 23:54:30 +01:00
a8b8da5567
Fix T58183: crash with CPU + GPU rendering after profiling changes.
...
Multi-device was not passing along profiler to the CPU.
2018-11-29 23:43:27 +01:00
6af997710b
Merge branch 'master' into blender2.8
2018-11-30 08:39:59 +11:00
8ac2d85d2f
Cleanup: trailing space
2018-11-30 08:38:25 +11:00
7c6fc8b275
Merge branch 'master' into blender2.8
2018-11-29 16:49:21 +01:00
2c154399a2
Fix internal compiler error when building with VS 2017 (15.9.3).
...
It doesn't like alignment for function arguments, and I don't think this
alignment is needed.
Solution found by Ray Molenkamp.
2018-11-29 16:42:52 +01:00
f24147d459
Merge branch 'master' into blender2.8
2018-11-29 09:35:39 +01:00
b00819bcca
Atomic: Avoid conflicts with definitions in other areas
...
While atomics library was trying to use "user-space" defined
LIKELY() and UNLIKELY(), this is not always true that user
code was checking for those macro coming from an unrelated
area.
2018-11-29 09:33:50 +01:00
9893fee4e6
Merge branch 'master' into blender2.8
2018-11-29 12:55:58 +11:00
140f2209b6
Cleanup: correct typo, no need for ./ prefix
2018-11-29 12:54:30 +11:00
7fa6f72084
Cycles: Add sample-based runtime profiler that measures time spent in various parts of the CPU kernel
...
This commit adds a sample-based profiler that runs during CPU rendering and collects statistics on time spent in different parts of the kernel (ray intersection, shader evaluation etc.) as well as time spent per material and object.
The results are currently not exposed in the user interface or per Python yet, to see the stats on the console pass the "--cycles-print-stats" argument to Cycles (e.g. "./blender -- --cycles-print-stats").
Unfortunately, there is no clear way to extend this functionality to CUDA or OpenCL, so it is CPU-only for now.
Reviewers: brecht, sergey, swerner
Reviewed By: brecht, swerner
Differential Revision: https://developer.blender.org/D3892
2018-11-29 02:45:24 +01:00
7c7f3776dd
Use collection and instance terminology in Python API
...
This follows naming convention agreed on in T56648.
2018-11-28 18:22:51 +01:00
91795e756c
Merge branch 'master' into blender2.8
2018-11-28 18:05:59 +01:00
2b371b65bc
More fixes for NUMA on macOS
2018-11-28 18:05:35 +01:00
11ff47a134
Merge branch 'master' into blender2.8
2018-11-28 17:57:37 +01:00
8a6aa15903
Fix compilation error on macOS
2018-11-28 17:57:04 +01:00
bef9f42ef0
Merge branch 'master' into blender2.8
2018-11-28 17:55:27 +01:00
547bc2a620
Fix compilation error on 32bit Windows
2018-11-28 17:54:58 +01:00
6fd5f95ca1
Fix (unreported) Cycles not rendering correctly modified curves/surfaces/texts.
...
Meshes from evaluated objects may already have modifiers applied, but
that's not the case for curves, we need to do that when converting them
to meshes.
2018-11-28 16:25:15 +01:00
3ed0d5b4d4
Merge branch 'master' into blender2.8
2018-11-28 14:42:38 +01:00
683662e630
Add cross-platform NUMA library
...
Makes it simple to use NUMA libraries on various platforms.
2018-11-28 14:35:26 +01:00
Sergey Sharybin