griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
86,811 Commits 1 Branch 0 Tags
f604e46780fcffbddec38f94deaaf1299fdb3f00
Commit Graph

5301 Commits

Author SHA1 Message Date
Campbell Barton
3633a79789 Cleanup: correct misleading classmethod arg 2019-04-19 07:36:07 +02:00
Campbell Barton
108045faa0 ClangFormat: format '#if 0' code in intern/ 2019-04-17 08:17:13 +02:00
Campbell Barton
91a9cd0a94 ClangFormat: manually format sobol.cpp 
Disabled because it uses a lot of memory and is mostly data.
 2019-04-17 06:35:07 +02:00
Campbell Barton
e12c08e8d1 ClangFormat: apply to source, most of intern 
Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat
 2019-04-17 06:21:24 +02:00
Campbell Barton
ca245b2b40 ClangFormat: disable for most of sobol.cpp 2019-04-17 06:00:20 +02:00
Campbell Barton
157872922a CMake: fix building WITH_CYCLES_LOGGING=ON 2019-04-16 14:56:34 +02:00
Campbell Barton
31c2e69d49 CMake: remove BLENDER_SORTED_LIBS 
Use CMake's target_link_libraries instead of manually maintaining
library dependencies in a single list.

In practice adding new libraries often ended up being guess-work,
now each library lists the libraries it uses.

This was used for the game player executable so libraries
could optionally link to stubs.

If we need this functionality it can be done using target-properties
as described in T46725.
 2019-04-16 12:36:44 +02:00
Campbell Barton
5498e7f193 CMake: add library deps to CMakeLists.txt 
Tested to work on Linux and macOS.

This will be enabled once all platforms are verified.

See D4684
 2019-04-16 06:20:52 +02:00
Campbell Barton
813e470eac CMake: cleanup, arg rename, add definitions last 2019-04-16 06:15:18 +02:00
Brecht Van Lommel
6a50a3d140 Fix T63346: Cycles OSL shader with closure not working in final render. 2019-04-16 03:03:24 +02:00
Campbell Barton
47adab4f99 CMake: prepare for BLENDER_SORTED_LIBS removal 
No functional change, this adds LIB definition and args to cmake files.
Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS'
since there are many platforms/configurations that could break when
changing linking order.

Manually add and enable WITHOUT_SORTED_LIBS to try building
without sorted libs (currently fails since all variables are empty).
This check will eventually be removed.

See T46725.
 2019-04-14 15:37:24 +02:00
Campbell Barton
b9eac0bb44 Cleanup: spelling 2019-04-10 08:40:49 +02:00
Brecht Van Lommel
b2e2db94bd Fix T60379: Cycles viewport adaptive subdivision hangs after updates. 
The camera world to raster computation was using wrong values. Also fixes
update when changing subdivision scene settings.
 2019-04-04 21:22:31 +02:00
Brecht Van Lommel
6d4d7c7ca3 Cycles: reduce number of synchronizing object prints. 
Do it only for meshes/curves since those are potentially slow and need user
feedback to see things are not stuck. For object instances and lights assume
it's fast enough.

Printing too much can have a performance impact on slow Windows command
prompt or when logging complex scene renders.
 2019-03-29 01:42:38 +01:00
Brecht Van Lommel
f589b28f80 Fix part of T63023: wrong Cycles window coordinates for background. 2019-03-27 22:21:23 +01:00
Brecht Van Lommel
c515ea2e93 Fix vertex array leak in Cycles viewport drawing. 2019-03-26 19:56:43 +01:00
Brecht Van Lommel
7574f90a71 Fix Cycles standalone build, needs OpenJPEG libraries with OIIO now. 2019-03-26 15:29:01 +01:00
Brecht Van Lommel
9c5c91cc7c Merge branch 'blender2.7' 2019-03-22 18:18:37 +01:00
Brecht Van Lommel
8e6f765964 Fix T62844: Cycles crash with bevel and degenerate geometry. 2019-03-22 17:30:36 +01:00
Brecht Van Lommel
b0c40de5ee Fix/workaround some types of black dots in denoising with bright speculars. 
This is not a real solution and colored dots still remain, just rejecting some
pixels that seem clearly wrong.
 2019-03-22 14:25:28 +01:00
Brecht Van Lommel
e0d95b7f79 Merge branch 'blender2.7' 2019-03-20 18:40:10 +01:00
Brecht Van Lommel
d7cecc2ba3 Fix cycles.merge_images not merging correctly for some channel layouts. 2019-03-20 18:39:26 +01:00
Brecht Van Lommel
b6d1946c2e Merge branch 'blender2.7' 2019-03-20 17:33:54 +01:00
Brecht Van Lommel
b06d32e4be Cycles: make cycles.merge_images work with incomplete layers and passes. 
If layers and passes are not exactly the same in all files, we make a best
effort to merge them instead of failing.
 2019-03-20 17:26:25 +01:00
Jacques Lucke
c4908c8e8c Fix T62758: hair curves with UV mapped textures renders wrong. 
Differential Revision: https://developer.blender.org/D4562
 2019-03-20 17:26:21 +01:00
Stefan Werner
69fb859909 Merge branch 'blender2.7' of git.blender.org:blender 2019-03-20 12:51:32 +01:00
Stefan Werner
63cb789551 Cycles: Made Embree ignore curve intersections with SSS. 2019-03-20 12:30:33 +01:00
Stefan Werner
5eb38df4af Cycles: Performance optimization for Embree, resizing arrays once instead of per object. 2019-03-20 12:30:33 +01:00
Brecht Van Lommel
d555c92e3c Cleanup: fix debug warnign due to tooltip ending in dot. 2019-03-19 19:16:39 +01:00
Brecht Van Lommel
fa59c6a3e7 Merge branch 'blender2.7' 2019-03-19 18:54:17 +01:00
Brecht Van Lommel
83de13f75a Cycles: add cycles.merge_images operator for combing EXR renders. 
This is only available through the API, mainly intended for render farms to
combine rendered multilayer EXR Files with different samples. The images are
currently expected to have the exact same render layers and passes, just with
different samples.

Variance passes are still simply a weighted average, ideally these should be
merged more intelligently.

Differential Revision: https://developer.blender.org/D4554
 2019-03-19 18:23:19 +01:00
Sergey Sharybin
5b7b7101c8 Cycles: Implement function to format and parse human readable time 
Gives value in seconds for a string which is encoded in format HH:MM:SS.hh.
 2019-03-19 17:38:43 +01:00
Jacques Lucke
9b8eef9d9c Fix T62558: Certain IES file causes crash 
Reviewers: brecht

Differential Revision: https://developer.blender.org/D4551
 2019-03-19 15:33:28 +01:00
Campbell Barton
5ef4b0438c Cleanup: trailing space 2019-03-19 15:08:16 +11:00
Brecht Van Lommel
a29186efb4 Merge branch 'blender2.7' 2019-03-18 19:06:21 +01:00
Brecht Van Lommel
01df4818a6 Fix Cycles curve UVs wrong after recent changes. 2019-03-18 19:02:59 +01:00
Brecht Van Lommel
d76fb8ec67 Fix T62712: Cycles world light path node not working. 2019-03-18 18:46:14 +01:00
Brecht Van Lommel
dff88a92a4 Fix AMD OpenCL build error after recent changes. 
Always use native function since this was already the case due to
__CL_USE_NATIVE__ not being defined in time, and seems to have caused no
known issues.
 2019-03-18 16:39:57 +01:00
William Reynish
d1f04658d8 Fix: Cycles Subdivisions panel was showing, even when using Eevee 2019-03-18 15:56:54 +01:00
Brecht Van Lommel
8162a6c51d Cleanup: fix compiler warnings. 2019-03-18 14:56:08 +01:00
Sergey Sharybin
4070bb242d Merge branch 'blender2.7' 2019-03-18 12:03:22 +01:00
Sergey Sharybin
7c5be750a3 Cycles: Cleanup strict compiler warnings 2019-03-18 12:02:41 +01:00
Brecht Van Lommel
76277e7402 Cleanup: fix compiler warning. 2019-03-18 10:42:56 +01:00
Brecht Van Lommel
df96455c55 UI: add light/world settings in shader node editor. 
Material was already there. Implementation was changed so it's just a
single line of code to adapt a panel to the node editor.
 2019-03-17 21:53:13 +01:00
Brecht Van Lommel
e691929686 Merge branch 'blender2.7' 2019-03-17 12:54:19 +01:00
Brecht Van Lommel
7778a1a0a1 Cycles: optimization for constant background colors. 
Skip shader evaluation then, as we already do for lights. Less than
1% faster in my tests, but might as well be consistent for both.
 2019-03-17 12:01:19 +01:00
Brecht Van Lommel
9c7517fb63 Fix Cycles OpenCL compile waiting unnecessarily for background shader. 
Makes preview kernel appear quicker when background color is fixed.
 2019-03-17 12:01:19 +01:00
Brecht Van Lommel
9873005ecd Cleanup: simplify kernel features definition. 
No functional changes, logic here got too complex after many changes over
the years.
 2019-03-17 12:01:19 +01:00
Brecht Van Lommel
2d8aa2e6ad Cleanup: remove unused code. 2019-03-17 11:39:17 +01:00
Brecht Van Lommel
5ad2302413 Fix Cycles not doing versioning for some files saved in 2.80. 2019-03-17 11:39:17 +01:00