Campbell Barton
0ffb19ca64
Revert "DWM: remove redundant state reset"
...
Enable this for now, needs some investigation.
2017-05-11 18:56:41 +10:00
Sergey Sharybin
2a2b23c142
Fix typo in the CMakeFile message
2017-05-11 10:06:12 +02:00
Campbell Barton
3465f80319
DWM: remove redundant state reset
2017-05-11 08:36:17 +10:00
Campbell Barton
1e9f922c9e
Merge branch 'master' into blender2.8
2017-05-11 07:53:03 +10:00
Campbell Barton
891159cea0
Merge branch 'master' into 28
2017-05-11 07:42:35 +10:00
Campbell Barton
722bcb554f
Sculpt Drawing: reduce redundant color conversion
...
Also replace macro with for loop.
2017-05-11 07:39:56 +10:00
Lukas Stockner
b82954f6f4
Fix T51455: Render Layers in compositor from a different scene not working
...
The code only updated nodes in the nodetree of the scene to which the render layer belongs. Therefore, when using scene B in the compositor setup of scene A, A's node wouldn't be updated.
With this fix, the update function loops over all scenes and checks them for relevant nodes.
2017-05-10 22:39:43 +02:00
Bastien Montagne
50b67d83a9
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/makesrna/intern/rna_space.c
2017-05-10 20:40:31 +02:00
Dalai Felinto
f305aba868
Make sure 'use_property_button_exec' can deal with arrays as well
2017-05-10 20:36:11 +02:00
Bastien Montagne
42c346028f
Fix missing relation in new DEG between World and its NodeTree.
...
Was preventing update in 3DView etc. when changing something in the
World's NodeTree, especially annoying in blender2.8 branch (since legacy
depsgraph has been removed there), but also affecting master.
2017-05-10 20:35:59 +02:00
Dalai Felinto
4f80260f11
Expand the collection settings RNA API for arrays
2017-05-10 20:04:50 +02:00
Dalai Felinto
4240b67e4c
Expand the collection settings API to support float arrays
...
We still need to update the RNA interface to access those. But since
there is no RNA_def_property_float_array_funcs I'm not sure how many
changes this will require.
2017-05-10 19:25:39 +02:00
Aaron Carlisle
8246246bda
UI: editor menu, swap Text and node editors
...
Proposed by @sebastian_k and approved by @severin over IRC.
Follows up on rB0f561da5fb77540626aec7a995314271a91acdf6
2017-05-10 12:20:57 -04:00
Dalai Felinto
e5ec386803
Merge remote-tracking branch 'origin/master' into blender2.8
2017-05-10 17:03:27 +02:00
Dalai Felinto
62aa925c11
Fix T51354: Final take on multi-view (single view) issues
...
We now handle selection and transform manipulators
(kudos to Julian Eisel to help hunting down the latter).
2017-05-10 16:54:57 +02:00
Clément Foucault
45207bf3ce
Eevee: Post process parameters.
...
-Display almost all parameters.
-Made some small adjustment to motion blur to support FOV motion blur.
-Made DOF max radius a parameter.
2017-05-10 16:03:25 +02:00
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
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
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
