griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
69,177 Commits 1 Branch 0 Tags
fdf2d8bb9592bd3a650b35d8bbd8a633169ac026
Commit Graph

69177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Foucault
fdf2d8bb95 Eevee: Support for light path node "is camera ray" output. 2017-05-10 16:03:25 +02:00
Clément Foucault
da8b34e527 Eevee: Fix some issues 
Fix issue with manipulator contributing to depth.
Fix blender internal shader.
 2017-05-10 16:03:25 +02:00
Dalai Felinto
7902e3f1c8 Fix multi-view (single camera) selection 2017-05-10 16:00:42 +02:00
Dalai Felinto
a438750cad Fix multi-view (single camera) manipulators selection 2017-05-10 15:54:23 +02:00
Dalai Felinto
1a6b97e98f Merge remote-tracking branch 'origin/master' into blender2.8 
Note: Depth placement was working already for BI, and althugh this
commit breaks it for it, it makes it work for the draw manager engines.
 2017-05-10 15:40:08 +02:00
Dalai Felinto
90997710cc Merge commit 'origin/master (9395646c2c)' into blender2.8 2017-05-10 14:21:14 +02:00
Dalai Felinto
195d0fbae3 Fixup for multi-view single eye viewport issues 
In d2f1f80a6f I was always calling view3d_main_regio_setup_view with
NULL matrices, which is not always correct.
 2017-05-10 13:13:55 +02:00
Campbell Barton
0722e41f9e DWM: Use Gawain for sculpt drawing 
Currently only uses the simple shader.
 2017-05-10 20:35:51 +10:00
Dalai Felinto
d2f1f80a6f Partial fix to Multi-View single eye issues in viewport 
Handling depth loop for now (3d cursor positioning). Selection is a bit
more tricky.

Reported on 51354
 2017-05-10 12:21:51 +02:00
Clément Foucault
1c18d07a1c Eevee: Make Depth of field zoom invariant. 
Multiply the sensor size by the viewcamtexcofac which is basicaly how scaled is the viewport relativly to the camera frame.
 2017-05-10 00:57:53 +02:00
Clément Foucault
965571cca7 Draw Manager: Handle negative scaled meshes. 2017-05-10 00:47:27 +02:00
Clément Foucault
707756d277 Draw Manager: Extend simplification to UBOs & fix a context error. 2017-05-09 23:55:19 +02:00
Clément Foucault
8277609810 Small cleanup 2017-05-09 23:55:19 +02:00
Clément Foucault
e32ec677c3 Draw Manager: Simplify usage and check for errors. 2017-05-09 23:55:19 +02:00
Clément Foucault
9075f934aa Eevee: Initial Depth Of Field commit. 2017-05-09 23:55:19 +02:00
Clément Foucault
435f5017fa GPUCompositing: Fix comment and component count. 2017-05-09 23:55:19 +02:00
Clément Foucault
1413bee158 Draw Manager: Add additive blending. 2017-05-09 23:55:19 +02:00
Clément Foucault
26b6bd6e90 Object Mode Engine: Fix grid distance if view is camera view. 2017-05-09 23:55:19 +02:00
Clément Foucault
306603ae76 GPUTexture: Add support for 32bit textures. 2017-05-09 23:55:19 +02:00
Clément Foucault
6dc8368b8f Draw Manager: Add Triangle batching and empty batch. 
This is usefull for Depth Of Field because we don't need to store data for each sprites and just generate them when rendering.
 2017-05-09 23:55:19 +02:00
Clément Foucault
bf0ebfca1a Draw Manager: Fullscreen triangle 
Used a triangle instead of a quad for fullscreen passes.
 2017-05-09 23:55:19 +02:00
Aaron Carlisle
9395646c2c Fix errors in vse ui commit 
- Fixes double labels
- Fixes an aligned layout when un-needed
- Fixes an error were a layout can become disabled but never enabled again
 2017-05-09 14:46:29 -04:00
Thomas Beck
894513c7fd Fix (unreported): Crash if a right click is performed on an image datablock (open btn f.e.). 
Only access/insert the button_pointer if it's not null...
 2017-05-09 20:12:25 +02:00
Dalai Felinto
75ba1826c8 Merge remote-tracking branch 'origin/master' into blender2.8 2017-05-09 17:56:16 +02:00
Sergey Sharybin
4d38932cb4 Cycles: Use more stable version of integer square root function 
Old code was working quite unreliable in combination with fast math
flag, especially when compiling with Clang. It seems we were hitting
result of the following bug submitted to Clang [1].

Basically, it was happening so that (int)sqrtf(64) was 7 when Cycles
is built with Clang but was correct 8 when built with GCC.

This commit works this around. Annoying, but don't see other way to
keep sampling pattern the same for Clang and GCC.

[1] https://bugs.llvm.org//show_bug.cgi?id=24063
 2017-05-09 17:07:17 +02:00
Sergey Sharybin
e20eb2dec0 Cycles: Properly free memory used by KernelGlobals 
Previous logic did not free memory used by vector classes
which were storing images, causing memory leaks.
 2017-05-09 17:07:17 +02:00
Bastien Montagne
24a64cb414 Fix shadow shader to support core profile. 2017-05-09 16:30:40 +02:00
Dalai Felinto
65ebb668ec glPushAttrib/Pop change implementation to use a stack 
The original implementation (cbd78c8126) broke depth of field.
 2017-05-09 15:23:33 +02:00
Jens Verwiebe
98ab2c682d Fix denoiser tooltip 2017-05-09 14:44:59 +02:00
Bastien Montagne
86c299c6a4 Merge branch 'master' into blender2.8 2017-05-09 14:33:05 +02:00
Dalai Felinto
dad797d037 Expose camera stereo settings in Clay engines 2017-05-09 12:33:13 +02:00
Carlo Andreacchio
ffc95a33b6 Fix T51434: Module math operation is wrong in GLSL shading 
Based on patch from @lazydodo.

Reviewers: sergey

Differential Revision: https://developer.blender.org/D2661
 2017-05-09 12:32:47 +02:00
Sergey Sharybin
06b2f10ad1 Cycles: Enable BPT for NVidia OpenCL 2017-05-09 11:44:18 +02:00
Sergey Sharybin
378d44daef Fix assert failure caused by bug in sequencer interface script 
If icon_only is True then one must not pass text attribute.
 2017-05-09 10:44:31 +02:00
Sergey Sharybin
586ab120e5 Libmv: Fix strict compiler warnings, unused variables 2017-05-09 10:16:42 +02:00
Sergey Sharybin
382c38efae Fix T51439: Object not updated when particle system settings change in 2.8 
A bit too early to disable workaround for particles.

Guess it was commented out after particles removal but was not brought back
after particles restore commit.
 2017-05-09 10:05:54 +02:00
Aaron Carlisle
0f561da5fb UI: Editor menu, move VSE below MCE 
The idea here is to keep things in a logical order to match the order of ones worflow.
This concept can be seen in Graph > Dope Sheet > NLA. This issue is mainly affecting the manual.

Fixes T50709

Differential Revision: https://developer.blender.org/D2630
 2017-05-08 23:38:31 -04:00
Campbell Barton
f7ce1be694 DWM: share positions & normals in shading VBO. 2017-05-09 10:56:22 +10:00
Campbell Barton
e35e23c72c Cleanup: rename layer-names -> layer-uuid 
These names are created from a hash,
don't confuse with actual layer names.
 2017-05-09 10:38:52 +10:00
Campbell Barton
faba1e7d6e DWM: Tangent support for editmesh 2017-05-09 10:26:36 +10:00
Sergey Sharybin
54af61440e Merge branch 'master' into blender2.8 2017-05-08 17:44:17 +02:00
Sergey Sharybin
717d85fb1c Fix missing render update when building without OCIO but having GLSL image draw method 2017-05-08 17:43:32 +02:00
Sergey Sharybin
a04c29e8ab Fix crash and assert failure when using OCIO GLSL draw mode and color management disabled 
The issue was happening when display device is set to None, which makes it so
all the color transformation is a no-op which does not really require any LUT.

This is something we can not know from Blender side easily, because LUT sampling
and related logic is fully done in OCIO library itself. The following happens:

- OCIO sees that no LUT is needed and uses simple pass-through logic in the
  color conversion function.

- GLSL compiles sees that uniform used for LUT is unused in the GLSL code and
  strips it out.

We can not know this from Blender side because technically any conversion to
the same space might be a no-op and that we wouldn't know without some tricky
parse of the OCIO configuration.

So for now we simply avoid crash but are disabling checks for existence of the
uniform.

Ideally would be nice to have some GLSL-code parses which gets the uniforms
from the code itself, so we can distinguish between typo in the uniform name
and uniform being optimized out.
 2017-05-08 16:45:07 +02:00
Sergey Sharybin
883c62d5d3 Add comment about vertex format created in OCIO 2017-05-08 16:40:59 +02:00
Sergey Sharybin
6aa7843de7 Fix wrong attributes and shader binding in sequencer when using OCIO 2017-05-08 16:38:49 +02:00
Sergey Sharybin
907135011a Fix hardcoded attribute locations used in image draw 2017-05-08 16:31:10 +02:00
Sergey Sharybin
81ecd3f938 Fix OCIO shader being attmepted to be unbound twice 2017-05-08 15:59:00 +02:00
Sergey Sharybin
0719a1bce0 Merge branch 'master' into blender2.8 2017-05-08 15:51:17 +02:00
Sergey Sharybin
49523c4d0e Cycles: Fix compilation error with gcc-6.3.0 and debug mode 2017-05-08 15:41:28 +02:00
Luca Rood
a1442b7cea Fix capitalization in some particle panels 2017-05-08 15:24:31 +02:00