Howard Trickey
1ee93dc670
Quiet warnings in bmesh_bevel.c.
2018-08-09 14:43:52 -04:00
Brecht Van Lommel
da42fa8c97
Merge branch 'master' into blender2.8
2018-08-09 18:11:13 +02:00
Arto Kitula
1282be0f82
update llvm + clang to 6.0.1 and add openmp for macOS
2018-08-09 17:57:12 +03:00
Clément Foucault
5b6dde2293
Eevee: Fix assert with subsurface bsdf
2018-08-09 16:46:03 +02:00
Clément Foucault
ddc2796e4d
Eevee: Principled BSDF: Add support for the sheen parameter
...
This is a rough (but fast) approximation that still match cycles reference
in common case.
In practice, it's just adding more of the diffuse light computed for the
diffuse contribution.
2018-08-09 16:46:03 +02:00
Rohan Rathi
2b41b208c7
Merge branch 'soc-2018-bevel' into blender2.8
2018-08-09 19:52:07 +05:30
Antonioya
85cac2221c
Fix T56279: Grease Pencil transformations show a help line with wrong origin
...
As grease pencil use multiedit frames instead of multiobject edit, this fix solves the issue.
In the future maybe will need modifications if we add multiobject support, but we need a solution now.
2018-08-09 16:14:29 +02:00
Rohan Rathi
fea5f26ea5
Fix trivial error in call
2018-08-09 18:56:46 +05:30
Rohan Rathi
42c2066d08
Fixed custom shading not updating in Edit Mode
2018-08-09 18:38:07 +05:30
Charlie Jolly
2e10c658f4
GP: Add option to select color affected in modifiers
...
Now it's possible to define if the Tint, Hue and OPacity modifier affect the stroke color, fill color or both.
2018-08-09 13:43:21 +02:00
Antonioya
f284821bf7
GP: Undo incorrect modification in previous commit
2018-08-09 13:39:35 +02:00
Brecht Van Lommel
0de50a98e3
Fix T56239: creating material crashes with OpenGL render engine selected.
2018-08-09 12:04:00 +02:00
Campbell Barton
bf2d0782bc
Merge branch 'master' into blender2.8
2018-08-09 08:20:06 +10:00
Andrew Hale
3aee3bbac7
Math Lib: varied size vector multiply
...
Needed for Python mathutils elementwise multiply.
2018-08-09 08:14:38 +10:00
Clément Foucault
c009b09f12
Eevee: Fix Clearcoat intensity
2018-08-08 21:27:33 +02:00
Clément Foucault
b8fc6317c7
Eevee: Remove per material SSS toggle
...
This is because we can now optimize the use of SSS on shaders based on
socket input values.
2018-08-08 21:27:33 +02:00
Clément Foucault
cac43e1765
Eevee: Use "constant folding" for the principle shader
...
This is more like a static optimisation when some parameters are set to 1.0
or 0.0. In theses case we use a more optimized version of the node.
This also revisit the transmission parameter behaviour to make it closer to
cycles.
2018-08-08 21:27:26 +02:00
Clément Foucault
26d46d00cf
GPUMaterial: Fix Material appear broken when using sliders to tweak props
...
This was likely caused by some sort of race condition where the drawing
thread would request the state of the shader before the shader has been
compiled.
2018-08-08 21:26:49 +02:00
Clément Foucault
82352565b7
Eevee: Remove some of the non-necessary uniforms
...
The remaining ones are from the attributes linear/srgb switches and from
nodes that should be pruned before running their _gpu function.
2018-08-08 21:26:49 +02:00
Antonioya
05c0992c9b
GP: Fix modifiers Tint, Opacity and Hue and create materials to Opacity
...
Thanks to Charlie Jolly (mistajolly@gmail.com ) for his patch D3586 that added create materials to opacity modifier.
I had to do some more changes to get all running.
2018-08-08 20:40:11 +02:00
Brecht Van Lommel
a2726e80d1
Merge branch 'master' into blender2.8
2018-08-08 20:31:08 +02:00
Brecht Van Lommel
440ef4235f
OpenJPEG: support building against both 1.5 and 2.3.
...
Patch porting to OpenJPEG 2.3 is by Campbell.
Once all platforms are upgraded we can remove the code for 1.5, and upgrade
or remove the openjpeg version from extern/. This intermediate step makes it
possible for platform maintainers to upgrade to 2.3 without breaking other
platforms.
2018-08-08 20:27:16 +02:00
Brecht Van Lommel
74f4eb419c
Cleanup: remove leftover game player code.
2018-08-08 20:18:54 +02:00
Bastien Montagne
e2e854d751
WeightVG modifiers: cleanup.
2018-08-08 20:13:17 +02:00
Bastien Montagne
c2d363b118
Fix T55818: Dynamically modified influence vertex group not working in modifier stack.
...
Now that we are using meshes, we need to assign back potential new
vgroup cdlayer to mesh->dvert pointer...
2018-08-08 20:08:36 +02:00
Antonioya
211ad6bf9a
GP: Fix memory leak in draw engine for buffer strokes
...
This memory leak was undetected during a long time, but with new memory checking is visible.
The problem was the stroke buffer batch was realocating new batches without free the memory.
2018-08-08 19:48:57 +02:00
Antonioya
5c4fd52612
Fix T56220: Adding Grease Object crashes if link Material is set to Object
2018-08-08 16:56:56 +02:00
Antonioya
78a6fa1a72
Cleanup: Move some duplicate code to new function
2018-08-08 13:37:56 +02:00
Campbell Barton
aa41c86636
Cleanup: trailing space
2018-08-08 20:45:43 +10:00
Antonioya
08e49c034b
GP: Fix unreported segment fault with some old files
...
In some corner situations for old files, the weights array could not be initialized properly.
2018-08-08 12:19:20 +02:00
Bastien Montagne
6a07818e8f
Cleanup unused arg warning.
2018-08-08 11:57:35 +02:00
Bastien Montagne
7a6d7d056b
Fix T56273: User count assert on re-saving a particular file.
...
new background image/clip of Camera ID was totally wrong, down the old,
broken 'way it used to be' instead of using new, more generic system.
Those ID pointers were not even added to library_query.c file, shame! xD
2018-08-08 11:56:41 +02:00
Antonioya
3e0bf69bfd
GP: Change to make the temp name unique
...
The previous commit could fail if some corner situations. This new temp name must be unique always.
2018-08-08 11:48:18 +02:00
Campbell Barton
bc63d6f39a
Fix T55095: Undo crash w/ linked library data
2018-08-08 19:16:43 +10:00
Antonioya
106e73da82
Fix T56270: Crash when save a grease pencil file with instance modifier.
...
The error was related to duplicate names in the internal hash used to order instances in z-depth.
2018-08-08 11:11:18 +02:00
Antonioya
65b31a4c9c
GP: Check render status before use it.
2018-08-08 11:11:18 +02:00
Bastien Montagne
b74612e034
Fix T56251: Outliner crash on selecting nested.
...
We need a valid tree here, undo step will make it invalid...
2018-08-08 10:57:40 +02:00
Campbell Barton
451203c58d
Merge branch 'master' into blender2.8
2018-08-08 17:13:43 +10:00
Campbell Barton
b496bf022b
Fix T54584: Crash w/ image undo
...
Using accumulation undo type (eg painting)
as the first undo step, broke code which adds an initial memfile undo.
2018-08-08 17:12:44 +10:00
Campbell Barton
bbaedad632
Minor tweak to last commit
2018-08-08 16:02:45 +10:00
Campbell Barton
ff74292138
3D View: hide object centers in paint modes
...
Match 2.7x behavior
2018-08-08 15:53:02 +10:00
Campbell Barton
e8e812fb1d
UI: only show vertex select w/ weight paint mode
...
Was being used for vertex paint where it's not supported.
2018-08-08 15:33:11 +10:00
Campbell Barton
b6dba5caac
Vertex Paint: use original mesh data
...
This is already done in weight paint mode,
avoids a mesh refresh on selection changes.
2018-08-08 15:17:30 +10:00
Campbell Barton
cb15854bf9
Fix missing uniform for vert/weight/texture paint
...
Entering any of these modes would assert immediately.
2018-08-08 15:08:50 +10:00
Campbell Barton
0cd2eb11ee
UV: stitch multi-object support
...
D3561 by @Al
2018-08-08 14:07:49 +10:00
Campbell Barton
c252a7c37a
UI: don't show pie menu w/ no active object
...
Addresses T56272
2018-08-08 13:30:27 +10:00
Campbell Barton
81e99bdc75
Merge branch 'master' into blender2.8
2018-08-08 13:14:07 +10:00
Campbell Barton
bb8497fd5d
Cleanup: correct header guard
...
Header guard was duplicated before renaming.
2018-08-08 13:11:57 +10:00
Campbell Barton
e71470e316
Merge branch 'master' into blender2.8
2018-08-08 11:53:22 +10:00
Campbell Barton
f86c965d7f
Cleanup: use conforming header guard
2018-08-08 11:49:51 +10:00