griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,073 Commits 1 Branch 0 Tags
bb8770b97648fc655b5de0aacb6ea6f816e9e26c
Commit Graph

61972 Commits

Author SHA1 Message Date
Campbell Barton
bfe1d0e0dc Merge branch 'master' into blender2.8 2018-06-01 18:26:42 +02:00
Campbell Barton
75fc1c3507 Cleanup: trailing whitespace (comment blocks) 
Strip unindented comment blocks - mainly headers to avoid conflicts.
 2018-06-01 18:19:39 +02:00
Campbell Barton
297bf7235b Cleanup: whitespace 2018-06-01 18:10:43 +02:00
Sybren A. Stüvel
c0dd355926 Modifiers: ported applying modifier from DerivedMesh → Mesh 2018-06-01 17:35:26 +02:00
Sybren A. Stüvel
4fccb8a023 Boolean modifier: fixed crash when applying the modifier 2018-06-01 17:35:26 +02:00
Bastien Montagne
e44743736f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_bake.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/render/render_internal.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-01 17:26:36 +02:00
Jeroen Bakker
e4a727626e X-Ray: Added a slider for the alpha 
- will not render when set to 0.0 for speed reasons. so when user sets
transparency to hide everything the bigger passes will be skipped.
 2018-06-01 17:15:35 +02:00
Jeroen Bakker
56dc2bf0c5 Workbench: Updated the internal light to have a bit of back lighting 2018-06-01 17:15:35 +02:00
Brecht Van Lommel
9e09900a30 Fix wrong colors for workbench World Background option. 2018-06-01 17:14:06 +02:00
Brecht Van Lommel
0706b410bd UI: use same "Viewport Display" name for scene/object/material panels. 2018-06-01 17:14:06 +02:00
Bastien Montagne
051e186d5c Cleanup: some more G.main removal from editor code. 2018-06-01 17:08:38 +02:00
Clément Foucault
b3be71e07a Mesh Batch Cache: Fix memory leak. 2018-06-01 17:07:45 +02:00
Joshua Leung
72a360827b T54991: Restore support for Motion Path drawing in 2.8 
This commit restores support for Motion Path drawing in 2.8 (as it wasn't ported over
to the new draw engines earlier, and the existing space_view3d/drawanimviz.c code was
removed during the Blender Internal removal).

Notes:
* Motion Paths are now implemented as an overlay (enabled by default).
  Therefore, you can turn all of them on/off from the "Overlays" popover

* By and large, we have kept the same draw style as was used in 2.7
  Further changes can happen later following further design work.

* One change from 2.7 is that thicker lines are used by default (2px vs 1px)


Todo's:
* There are some bad-level calls introduced here (i.e. the actgroup_to_keylist() stuff).
  These were introduced to optimise drawing performance (by avoiding full keyframes -> keylist
  conversion step on each drawcall). Instead, this has been moved to the calculation step
  (in blenkernel).  Soon, there will be some cleanups/improvements with those functions,
  so until then, we'll keep the bad level calls.


Credits:
* Clément Foucault (fclem) - Draw Engine magic + Shader Conversion/Optimisation
* Joshua Leung (Aligorith) - COW fixes, UI integration, etc.


Revision History:
See "tmp-b28-motionpath_drawing" branch (rBa12ab5b2ef49ccacae091ccb54d72de0d63f990d)
 2018-06-01 16:38:21 +02:00
Campbell Barton
06c4106d03 Fix for fix, indentation was accidental 2018-06-01 15:42:00 +02:00
Campbell Barton
75b2729488 Fix missing braces 2018-06-01 15:37:53 +02:00
Brecht Van Lommel
13ca63d2ad Draw background on pulldown widgets if the header is transparent. 
Since the viewport header now supports transparency, text on pulldowns
can be hard to read if their color matches the viewport content.

Background is drawn using the 'inner' theme color, that was unused until now.
 2018-06-01 15:11:38 +02:00
Bastien Montagne
3b05034935 Fix broken logic in make static override operators for Collections. 
Was pretty sure I already fixed that some weeks ago... but look like it
was not committed or somehow lost...
 2018-06-01 14:31:29 +02:00
Campbell Barton
ddf2a58282 Mesh: Replace DM for mesh w/ wpaint vertex picking 2018-06-01 14:29:22 +02:00
Campbell Barton
82b8fd8eaf UI: don't show XYZ text w/ direction buttons 2018-06-01 14:10:43 +02:00
Campbell Barton
32c12d057f Cleanup: rename vars 2018-06-01 14:01:46 +02:00
Campbell Barton
be8016908d Mesh: Replace DM for mesh -> curve conversion 2018-06-01 14:01:44 +02:00
Campbell Barton
4faf9bfbe9 Mesh versions of DerivedMesh access API calls 
Add mesh_get_eval_final & mesh_get_eval_deform

Note: these will eventually need to be renamed & moved into BKE.
 2018-06-01 13:58:53 +02:00
Campbell Barton
b85d5b6d52 Cleanup: quiet warning, don't set unused alpha 2018-06-01 13:58:53 +02:00
Jeroen Bakker
83a41ccd0a LookDev: make sure lookdev balls are still visible after 'N' 2018-06-01 12:52:10 +02:00
Clément Foucault
cfdadc7d61 Edit Mode: Fix Edit Object renderability with multi objects edit. 2018-06-01 12:28:32 +02:00
Jeroen Bakker
0c18024a8d Fix error 2018-06-01 12:04:24 +02:00
Jeroen Bakker
c771bbc27e Code cleanup: Compiler warning 2018-06-01 12:01:31 +02:00
Brecht Van Lommel
01c75c3765 Math: optimizations for 4x4x matrix inverse, multiplications. 
In some heavy rigs matrix inverse can be 10% of computation time. This
reduces it to 2% by using Eigen's optimized 4x4 matrix inverse and SSE
matrix multiplication.
 2018-06-01 12:00:11 +02:00
Brecht Van Lommel
719e782f2c Modifiers: tiny optimizations for mesh deform, lattice, kdop. 2018-06-01 12:00:11 +02:00
Brecht Van Lommel
bcbee4b9a3 Fix missing animation updates when the proxy object is not visible. 
The relation was inverted here, for a long time already. The reason is
unclear and in principle it should work fine in the right direction.
 2018-06-01 12:00:11 +02:00
Brecht Van Lommel
1bc801e020 Fix use of uninitialized value in depsgraph. 2018-06-01 12:00:11 +02:00
Campbell Barton
14c55a5828 Cleanup: long lines 2018-06-01 11:59:15 +02:00
Dalai Felinto
e35dab0fec Fix building for workbench in windows (BLI_INLINE) 2018-06-01 11:55:50 +02:00
Sybren A. Stüvel
0bddf5315f Fix T55282: Modifiers: Removed unnecessary object evaluation 2018-06-01 11:50:53 +02:00
Sybren A. Stüvel
8f24d404fe Removed old mention of CDDerivedMesh 2018-06-01 11:50:53 +02:00
Campbell Barton
e614a8290c Fix/Workaround T55272: Sculpt/VPaint removes mesh 2018-06-01 11:49:10 +02:00
Campbell Barton
e8142ad7dc Cleanup: quiet warnings 2018-06-01 11:49:10 +02:00
Clément Foucault
4683091369 Object Mode: Display loose edges if overlays are enables. 
This fix T55280 Loose edges not visible in object mode
 2018-06-01 11:36:01 +02:00
Jeroen Bakker
d5a359b1d4 Fix: overlays are reset when selection is being performed 
/me hits myself in the head. In selection code the flags were not tested
but set directly.
 2018-06-01 11:31:30 +02:00
Jeroen Bakker
c450966e95 Workbench: Material specific settings for the specular 
- Uses the roughness setting of the basic eevee material
- renamed gloss_mir to roughness
- set default of roughness to 0.25
- renamed ray_mirror to metallic
- cleaned up material rna (BI mirror struct)
- use BLINN phong model
- normalize incoming/outgoing specular light
- when using camera oriented studiolight, the SolidLight will be used
for specular highlights
- EXPERIMENT: when in world oriented studiolight only the shadow direction will be used.
- change the settings of the internal light to make scenes more
readable
 2018-06-01 11:01:55 +02:00
Campbell Barton
3b2d3a3cd1 Fix crash switching sculpt/vpaint -> edit mode 2018-06-01 10:34:00 +02:00
Campbell Barton
fe09aa602a 3D View: hide orbit navigation in camera view 
Typically for camera views it's nicer not to overlay large widgets,
only include the button to exit camera view.
 2018-06-01 10:17:07 +02:00
Sybren A. Stüvel
c338ac9454 Modifiers: ported Soft Body DerivedMesh → Mesh 
The simulation doesn't seem to update properly yet.
 2018-06-01 10:04:46 +02:00
Campbell Barton
3cefb27830 Partial Revert of COW/Camera manipulator changes 
d64fbe9456 3e26b84397
 2018-06-01 09:48:40 +02:00
Campbell Barton
266fc1c1ff Revert "COW Fix: Lamp manipulators" 
This reverts commit 33e45658eb.

No longer needed.
 2018-06-01 09:25:24 +02:00
Campbell Barton
5736157b5e 3D View: respect text option for edit-mode info 2018-06-01 09:22:08 +02:00
Campbell Barton
a6395cebb7 Error in last commit 2018-06-01 08:31:32 +02:00
Campbell Barton
c87cfcc8de 3D View: make text overlay optional 2018-06-01 08:26:55 +02:00
Campbell Barton
63785a889c 3D View: support world background color 2018-06-01 08:16:24 +02:00
Pablo Vazquez
35efa1d3d3 Add 'Toggle Header' to header context menu. 
Also disable collapsing the header by dragging it up/down. This prevents
accidentally hiding the header when resizing areas.
 2018-06-01 02:55:16 +02:00