griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
83,061 Commits 1 Branch 0 Tags
309d4bfbbc4114d314aa174fee96e716bc4fe5df
Commit Graph

8414 Commits

Author SHA1 Message Date
Bastien Montagne
a3b03b8146 Merge branch 'master' into blender2.8 2018-12-05 15:15:06 +01:00
Bastien Montagne
834fa06614 Fix (unreported) building Cycles tests with Embree enabled. 2018-12-05 15:14:16 +01:00
Bastien Montagne
fb3f1a3567 Merge branch 'master' into blender2.8 2018-12-05 14:41:00 +01:00
Sergey Sharybin
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
Brecht Van Lommel
c9344d6c5b Fix T58776, T58030: pressure sensitivity on Linux not working for some tablets. 2018-12-05 14:02:37 +01:00
Brecht Van Lommel
4a21345665 Merge branch 'master' into blender2.8 2018-12-05 12:54:45 +01:00
Brecht Van Lommel
f5b46daf52 Fix build with old CMake versions. 2018-12-05 12:53:19 +01:00
Gaia Clary
5c3955452b Merge branch 'master' into blender2.8 2018-12-04 19:48:21 +01:00
Niels
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
Brecht Van Lommel
b9b88d59dd Merge branch 'master' into blender2.8 2018-12-04 16:35:16 +01:00
Brecht Van Lommel
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
Brecht Van Lommel
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
Sergey Sharybin
df2635099b Merge branch 'master' into blender2.8 2018-12-04 11:45:22 +01:00
Shane Ambler
5a6f1fa563 Fix T58600: update OSL scripts to work with OSL 1.10.x. 2018-12-03 15:14:21 +01:00
Bastien Montagne
394b086b9c Fix T58556: Some remaining 'dupli_types' in pycode after renaming. 2018-12-03 10:39:54 +01:00
Antony Ryakiotakis
0f5b53ba4d Revert "Win32: Use the nicer looking blender-drawn confirmation message box when" 
This reverts commit 60d6eb0b5d.

There is already a full patch (D3118) by brecht for this, will leave it up to him.
 2018-11-30 23:29:32 +01:00
Antony Ryakiotakis
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
Campbell Barton
cb8afaf5db Merge branch 'master' into blender2.8 2018-11-30 17:07:59 +11:00
Campbell Barton
6e253fc627 Correct missing semicolon in recent commit 2018-11-30 17:07:13 +11:00
Brecht Van Lommel
63c0653170 Merge branch 'master' into blender2.8 2018-11-29 23:54:30 +01:00
Brecht Van Lommel
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
Campbell Barton
6af997710b Merge branch 'master' into blender2.8 2018-11-30 08:39:59 +11:00
Campbell Barton
8ac2d85d2f Cleanup: trailing space 2018-11-30 08:38:25 +11:00
Brecht Van Lommel
7c6fc8b275 Merge branch 'master' into blender2.8 2018-11-29 16:49:21 +01:00
Brecht Van Lommel
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
Sergey Sharybin
f24147d459 Merge branch 'master' into blender2.8 2018-11-29 09:35:39 +01:00
Sergey Sharybin
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
Campbell Barton
9893fee4e6 Merge branch 'master' into blender2.8 2018-11-29 12:55:58 +11:00
Campbell Barton
140f2209b6 Cleanup: correct typo, no need for ./ prefix 2018-11-29 12:54:30 +11:00
Lukas Stockner
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
Sergey Sharybin
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
Sergey Sharybin
91795e756c Merge branch 'master' into blender2.8 2018-11-28 18:05:59 +01:00
Sergey Sharybin
2b371b65bc More fixes for NUMA on macOS 2018-11-28 18:05:35 +01:00
Sergey Sharybin
11ff47a134 Merge branch 'master' into blender2.8 2018-11-28 17:57:37 +01:00
Sergey Sharybin
8a6aa15903 Fix compilation error on macOS 2018-11-28 17:57:04 +01:00
Sergey Sharybin
bef9f42ef0 Merge branch 'master' into blender2.8 2018-11-28 17:55:27 +01:00
Sergey Sharybin
547bc2a620 Fix compilation error on 32bit Windows 2018-11-28 17:54:58 +01:00
Bastien Montagne
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
Sergey Sharybin
3ed0d5b4d4 Merge branch 'master' into blender2.8 2018-11-28 14:42:38 +01:00
Sergey Sharybin
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
0970ed0550 Merge branch 'master' into blender2.8 2018-11-26 12:00:36 +01:00
Sergey Sharybin
acd1d1a31d CMake: Remove Cycles specific OpenSubdiv options 
Just use one flag which enables OpenSubdiv globally for all the
areas of Blender.
 2018-11-26 11:41:38 +01:00
Campbell Barton
a0cde8ed08 Cleanup: unused vars 2018-11-26 09:26:38 +11:00
Brecht Van Lommel
a2e209f20a Merge branch 'master' into blender2.8 2018-11-24 23:44:17 +01:00
Brecht Van Lommel
7c19d9e9af Fix X11 tablet pen and eraser distinction being wrong in some cases. 
This extends the earlier fix to use the latest logic from Wine's wintab.c,
to better handle eraser detection.
 2018-11-24 23:24:32 +01:00
Campbell Barton
059c119719 Merge branch 'master' into blender2.8 2018-11-25 08:01:53 +11:00
Campbell Barton
e742e0934d Cleanup: trailing space 2018-11-25 08:01:14 +11:00
Brecht Van Lommel
fa0fcbe4d6 Fix T56374, T57066, T58037: crash on startup on macOS when using translation. 2018-11-24 20:04:53 +01:00
Jens Verwiebe
e5bc9fae54 Fix penpressure for tablets that use libinput on linux 2018-11-24 18:26:20 +01:00
Sergey Sharybin
d891c8f1f8 Merge branch 'master' into blender2.8 2018-11-23 14:41:21 +01:00