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

8438 Commits

Author SHA1 Message Date
Philipp Oeser
ac68f44b8a fix shader editor errors when showing world shader tree 
probably an oversight in rBd40bffa17f6d

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4079
 2018-12-14 19:01:22 +01:00
Brecht Van Lommel
f527ce5b2f Color management: add OCIO aware utility functions for transform to/from XYZ. 2018-12-13 19:25:46 +01:00
Sergey Sharybin
b8cb08fa56 Merge branch 'master' into blender2.8 2018-12-13 14:32:32 +01:00
Sergey Sharybin
2947882bb1 Cycles: Update standalone app to OIIO 2.0 2018-12-13 14:31:38 +01:00
Campbell Barton
5b6cb2de9a RNA: revert recent rename 'updated' -> 'dirty' 
Partially reverts 45fdf41be8 & 6d38d82437,
added comment why term 'updated' is used in this case.
 2018-12-13 23:19:01 +11:00
Sergey Sharybin
4d115f2159 Merge branch 'master' into blender2.8 2018-12-11 15:56:04 +01:00
Sergey Sharybin
66d8bfb85c Update code to be compatible with OIIO 2.0 
There are some changes in API of OpenImageIO, but those are quite
simple to keep working with older and newer library versions.

Reviewers: brecht

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D4064
 2018-12-11 15:50:02 +01:00
Brecht Van Lommel
f60018e425 Merge branch 'master' into blender2.8 2018-12-11 15:18:43 +01:00
Brecht Van Lommel
84b02dc54a Cleanup: remove accidentally committed debug code. 2018-12-11 15:18:15 +01:00
Sergey Sharybin
ece109dd60 Cycles: Add strict assert when assigning input socket stack offset 2018-12-11 14:34:52 +01:00
Sergey Sharybin
b45b082531 Cycles: Remove old nasty workaround 
It used to be used for some sort of ignoring automatically
generated bump nodes. But nowadays it causes one of the shaders
in Classroom demo file to be compiled wrong.
 2018-12-11 14:34:52 +01:00
Brecht Van Lommel
765795aed7 Fix macOS buildbot build, wrong CUDA version check. 2018-12-11 14:16:48 +01:00
Sergey Sharybin
39d24ffccb Cycles: Cleanup, indentation 2018-12-11 12:57:57 +01:00
Sergey Sharybin
d7e7c4ddf7 Cycles: Restore properties in the interface 
They got lost in one of the merges it seems.
 2018-12-10 15:54:45 +01:00
Sergey Sharybin
4fe578c827 Merge branch 'master' into blender2.8 2018-12-07 15:00:48 +01:00
Sergey Sharybin
3b1f90ed84 Cycles: Do more user-friendly indication that GPU devices are not found 2018-12-07 14:53:29 +01:00
Sergey Sharybin
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
Dalai Felinto
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
Campbell Barton
606223f6a6 Merge branch 'master' into blender2.8 2018-12-07 15:54:17 +11:00
Lucas Boutrot
d40bffa17f UI: add material settings in shader editor sidebar. 
Differential Revision: https://developer.blender.org/D3926
 2018-12-07 00:57:20 +01:00
Brecht Van Lommel
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
Sergey Sharybin
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
Sergey Sharybin
a60536956e Color management: Fix issue when active views/displays are not specified 2018-12-06 09:16:52 +01:00
Clément Foucault
5584cad5d9 GHOST: WGL: Silence Errors when testing opengl context versions 2018-12-05 21:57:49 +01:00
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