griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
78,408 Commits 1 Branch 0 Tags
4e2228525fc9bbcff58e315c5e3bbc193cd63a0b
Commit Graph

8049 Commits

Author SHA1 Message Date
Campbell Barton
952ae70109 Cleanup: unused function 2018-07-03 13:53:52 +02:00
Clément Foucault
e30f25ba22 GHOST: Fix assert and rebind previous ogl context. 2018-07-03 13:36:04 +02:00
Clément Foucault
433e3db8d8 Revert "GHOST: Delay opengl context initialization" 
This reverts commit 128926a41b.
 2018-07-03 13:36:04 +02:00
Clément Foucault
6c9fe9cd8c Revert "GHOST: WGL: Delay context initialization for offscreen contexts." 
This reverts commit 800c3c5ca5.

# Conflicts:
#	intern/ghost/intern/GHOST_ContextWGL.cpp
 2018-07-03 13:36:04 +02:00
Clément Foucault
d78bcf9055 Revert "GHOST: Fix uninitialized var" 
This reverts commit 27b6734022.
 2018-07-03 13:36:04 +02:00
Clément Foucault
7a8403dbb0 Revert "GHOST: Fix uninitialized values." 
This reverts commit aca403c819.
 2018-07-03 13:36:04 +02:00
Campbell Barton
c2814f5b28 Merge branch 'master' into blender2.8 2018-07-02 18:18:16 +02:00
Sergey Sharybin
e5767eaad1 Cycles: Fix missing curve hair when building with GCC-8 in release mode 
Reshuffle cast intrinsics to make XOR to operate on __m128i rather
than on __m128.

Hopefully this does not affect performance.
 2018-07-02 15:16:14 +02:00
Campbell Barton
37994e0af2 Merge branch 'master' into blender2.8 2018-07-01 20:15:21 +02:00
Brecht Van Lommel
9c5203c98f Fix T55626, fix T55106: Cycles motion blur + persistent images bug. 2018-07-01 16:32:35 +02:00
Campbell Barton
36a9436d80 Merge branch 'master' into blender2.8 2018-07-01 16:22:06 +02:00
Campbell Barton
ddee0931b8 RNA: use bool for boolean RNA types 
We were using int's for bool arguments in BKE,
just to avoid having wrapper functions.
 2018-07-01 15:57:59 +02:00
Campbell Barton
bc95c7a3ea Cleanup: remove num argument prefix 2018-07-01 09:23:51 +02:00
Campbell Barton
25b7bdb6a9 Merge branch 'master' into blender2.8 2018-06-30 09:29:38 +02:00
Brecht Van Lommel
ccacf3ae3c Cycles: change AO node default to 16 samples and only local off. 2018-06-29 15:43:55 +02:00
Campbell Barton
18d87e79e9 Merge branch 'master' into blender2.8 2018-06-29 09:25:40 +02:00
Campbell Barton
b372766816 Cleanup: trailing newlines 2018-06-29 09:23:51 +02:00
Campbell Barton
9bd0c63382 Merge branch 'master' into blender2.8 2018-06-29 08:05:38 +02:00
Campbell Barton
af36dd4664 Cleanup: trailing newlines 2018-06-29 08:02:49 +02:00
Brecht Van Lommel
8b2297847f Merge branch 'master' into blender2.8 2018-06-28 00:13:52 +02:00
Brecht Van Lommel
9536f67e7e Fix Cycles tests build on macOS. 2018-06-28 00:11:01 +02:00
William Reynish
d48600fddc UI: Single-column layout for Lamp panel 2018-06-27 14:23:17 +02:00
Sybren A. Stüvel
b4c01aca30 Merge branch 'master' into blender2.8 2018-06-26 17:42:33 +02:00
William Reynish
25caedc4ba UI: Tweaks to Cycles Bake panel 
-Correctly aligns bake options in the column
-Updated Metadata panel with right-aligned checkboxes for consistency
 2018-06-26 14:17:02 +02:00
Stefan Werner
73eb1bfd55 Revert "Turned off clang warnings in third party includes." 
This reverts commit d53093953f.
 2018-06-26 10:26:56 +02:00
Campbell Barton
ea339dc62c Merge branch 'master' into blender2.8 2018-06-26 09:34:13 +02:00
Lukas Stockner
87f598fd3f Cycles: Fix wrong row count for World MIS CDF calculation 2018-06-26 05:35:30 +02:00
Stefan Werner
d53093953f Turned off clang warnings in third party includes. 
The latest clang compiler (at least the one in Xcode 9.4.1) warns about the register keyword and macro expansions using defined().
Since these warnings come from third party code, we can't address them directly in Blender. Silencing them via #pramgas will
at least keep the warnings during a build down to the ones that are relevant to Blender code.
 2018-06-25 23:02:01 +02:00
Sergey Sharybin
7cd86cd1fe Cycles: Fix memory leak with session 
We didn't check for sync object being already allocated.
In fact, we simply need to use proper function to free
session.
 2018-06-25 17:28:46 +02:00
Sergey Sharybin
cdee53edfc Cycles: Cleanup, indentation 2018-06-25 12:39:44 +02:00
Campbell Barton
d32e4ca701 Merge branch 'master' into blender2.8 2018-06-25 07:43:51 +02:00
Brecht Van Lommel
574c716f2d Cycles: change AO node color default to 1.0. 2018-06-24 12:24:30 +02:00
Ray Molenkamp
2fa231a86b Ghost: Fix F12 render on windows. 
createOffscreenContext left the new context bound to the calling thread
causing a race condition with the background thread doing the actual
rendering. see T55555 for a more detailed description of the problem.

this patch changes the behavior of createOffscreenContext to restore the
context to the calling context.

Reviewers: fclem

Differential Revision: https://developer.blender.org/D3499
 2018-06-23 11:37:35 -06:00
Sergey Sharybin
6cd0484de8 CMake: Make language explicit for per-file strict flags removal 2018-06-22 14:40:00 +02:00
Sergey Sharybin
9921e10583 Math: Set matrix to zero when inversion fails 
Avoids usage of uninitialized memory when inversion fails.

That uninitialized memory can cause object to become visible when
it is supposed not to or other artifacts like that.

Longer term solution would be to check every instance of invert_m#
function and to explicit fallback when needed (possibly, using
extra utility functions).
 2018-06-22 12:08:18 +02:00
Campbell Barton
78653cfb8c Merge branch 'master' into blender2.8 2018-06-21 16:43:39 +02:00
Brecht Van Lommel
cd6cb55ff3 Fix Cycles incorrect versioning for automatic sample world resolution. 2018-06-21 15:28:59 +02:00
Campbell Barton
c054a1a848 Merge branch 'master' into blender2.8 2018-06-21 15:02:38 +02:00
Brecht Van Lommel
a283333cd8 Fix Cycles CUDA render errors with CUDA 9.2. 
Work around what might be a compiler bug.
 2018-06-21 12:32:32 +02:00
Brecht Van Lommel
d6313f47af Fix T55564: Cycles OpenCL build error on some scenes. 2018-06-21 11:46:52 +02:00
Campbell Barton
7d3589e660 Cleanup: pep8, single quotes for enums 2018-06-20 18:22:52 +02:00
Bastien Montagne
61af6b83e6 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c
 2018-06-19 16:49:54 +02:00
Stefan Werner
9ff135d85d Cycles: Fixed crash when the camera was inside 16 volumes or more. It still won't render those volumes correctly, but at least the crash is addressed. 2018-06-19 16:35:18 +02:00
Brecht Van Lommel
a7e66d89d0 Merge branch 'master' into blender2.8 2018-06-19 16:21:35 +02:00
Brecht Van Lommel
668f39519c Fix T55528: Cycles AO node should default to 1 if radius is 0. 2018-06-19 11:45:05 +02:00
Ray Molenkamp
8c77c36539 Ghost: Fix offline OGL render on windows. 
rBe0c088f8fb5a introduced offline rendering support on windows, sadly it was trying to use the desktop window for getting a context, which given SetPixelFormat can only be called once for any given HDC was an unfortunate choice.

This patch uses a temporary hidden window for getting the opengl context.

Reviewers: mano-wii

Differential Revision: https://developer.blender.org/D3481
 2018-06-18 18:10:45 -06:00
Campbell Barton
05dc109553 Merge branch 'master' into blender2.8 2018-06-17 20:37:10 +02:00
Campbell Barton
e7a68ef843 Cleanup: trailing space in CMake files 2018-06-17 20:15:24 +02:00
Campbell Barton
ab20901c9e Cleanup: codestyle 2018-06-17 12:03:22 +02:00
Ray Molenkamp
0a08c5cd36 Fix : Build error with uchar in intern_gawain. 
error introduced by  D3483, intern_gawain has no access to bli_systypes.h
 2018-06-16 21:49:11 -06:00