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

62203 Commits

Author SHA1 Message Date
Campbell Barton
908b6960c0 Merge branch 'master' into blender2.8 2018-06-08 08:10:35 +02:00
Campbell Barton
a25c11fd8d Cleanup: trailing space 
Remove from blender/nodes, collada, blenfont & render.
 2018-06-08 08:07:48 +02:00
Campbell Barton
d352a0adc5 Merge branch 'master' into blender2.8 2018-06-08 08:02:50 +02:00
Campbell Barton
009c38df53 Fix recently added drag events closing menus 2018-06-08 08:01:43 +02:00
Campbell Barton
8b5ce6e843 Transform: fix non-3D view editmode assert 2018-06-08 06:31:40 +02:00
Campbell Barton
30cd35a37b Keymap: continued testing/development 
After testing in the studio and extending the event system for
drag events, we've agreed on adjustments to the new keymap,
see: T55162

- Tab: Edit-mode toggle.
- Tab + Cursor Drag: mode switching pie menu.
- Accent/Grave: for 3D view pie menu.
- F3: Search
- 1..3, Shift-1..3: Edit mesh vertex/edge/face toggle.

Other minor changes were made, however they aren't part of the design.

- Ctrl-Shift-S: Image editor Save-As (was F3)
- Ctrl-Alt-R: Repeat history (was F3)
 2018-06-07 20:46:12 +02:00
Campbell Barton
cfc4805455 Merge branch 'master' into blender2.8 2018-06-07 20:41:10 +02:00
Campbell Barton
8f49299134 WM: fix drag events applying after release 2018-06-07 20:39:17 +02:00
Dalai Felinto
18e316bcb9 Uniform Buffer Objects: Simplification refactor 
Since we are only creating this and never updating, there is no need for
the original approach with the individual data to be updated.

Note we only populate the GPU data when binding the UBO, so we can in the
future easily create the UBOs in a separate thread than the main drawing one.

Also at the moment animated materials are not working. To fix that we need
to free/tag for free the GPUMaterials in BKE_material_eval.
 2018-06-07 20:34:00 +02:00
Dalai Felinto
57da454872 Uniform Buffer Object: No more dirty tagging calls/check 2018-06-07 19:42:03 +02:00
Dalai Felinto
1962ae69b1 Rename GPU_material_create_uniform_buffer > GPU_material_uniform_buffer_create 2018-06-07 19:40:47 +02:00
Dalai Felinto
56f2293a51 GLSL: No need to extract the UBO dynamic inputs 2018-06-07 19:40:08 +02:00
Dalai Felinto
e5bc37eb5e Don't tag UBO as dirty anymore otherwise it still crashes on render 2018-06-07 19:19:39 +02:00
Dalai Felinto
d17094b256 BKE_world_eval: cleanup 2018-06-07 19:16:26 +02:00
Dalai Felinto
85e2871382 No more need to tag sss as dirty for EEVEE 
And for the records, this shoudn't have been added to the
GPU_material_uniform_buffer_tag_dirty function since they are unrelated.
 2018-06-07 19:13:23 +02:00
Clément Foucault
d32b59fc18 Remove more printfs .... 2018-06-07 19:06:56 +02:00
Sybren A. Stüvel
630019d5f8 Alembic export: use depsgraph to get evaluated mesh/object 2018-06-07 19:01:45 +02:00
Sybren A. Stüvel
28817c82f1 Alembic export: no need to check particle's mesh_final on export 
Hair writing is still not working properly, though, but at least now
samples are written at all.
 2018-06-07 19:01:45 +02:00
Sybren A. Stüvel
9a873d0ab2 Alembic import: don't crash Blender when reading invalid samples 2018-06-07 19:01:45 +02:00
Sybren A. Stüvel
5852c66125 Alembic hair writer: avoid double-free 2018-06-07 19:01:45 +02:00
Sybren A. Stüvel
20d3ce57d0 Alembic export: cleaned up multiply-passed depsgraph & scene 
Those can now solely be found in the ExportSettings object.
 2018-06-07 19:01:45 +02:00
Clément Foucault
ef7b7efd11 Eevee: Fix hair not rendering. 2018-06-07 18:58:13 +02:00
Bastien Montagne
3b556a477d Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_vertex.c
	source/blender/editors/sculpt_paint/sculpt.c
	source/blender/editors/sculpt_paint/sculpt_undo.c
 2018-06-07 18:45:45 +02:00
Clément Foucault
5593baea1b Remove printfs 
... it's getting late here.
 2018-06-07 18:44:37 +02:00
Clément Foucault
0859492c75 Fix crash cause by SSS referencing Material Nodetree data. 2018-06-07 18:43:43 +02:00
Clément Foucault
a3773dcc4f Fix memleak with GPUhairs. 2018-06-07 18:43:10 +02:00
Bastien Montagne
80dcb2ced8 Cleanup: typo, and 0 -> false for booleans. 2018-06-07 18:36:16 +02:00
Clément Foucault
00233f5f78 Wireframe: Fix edges or non manifold meshes not showing. 
This will show the associated edges to the vertices but that's the only
workaround I can think of right now.
 2018-06-07 18:01:36 +02:00
Clément Foucault
f9ca750bdf Wireframe: Change / Optimize the limited wireframe visibility option. 
This make the limited wireframe not a performance problem anymore.

However, this does change the number of edges displayed as the threshold
is now computed per vertex instead of per edges.

For this reason we extended (internaly) the range of the slider so that the
users can hide more edge.
 2018-06-07 18:01:36 +02:00
Campbell Barton
3823287179 Merge branch 'master' into blender2.8 2018-06-07 17:08:55 +02:00
Campbell Barton
d274c64d22 WM: add support for drag events 
This allows for a single key to be mapped to both release and drag,
useful for pie menus to share a key with a different action.
 2018-06-07 17:06:01 +02:00
Campbell Barton
8dc33a81b0 Merge branch 'master' into blender2.8 2018-06-07 16:53:31 +02:00
Campbell Barton
df4525d1d9 Fix key repeat events resetting the click timer 2018-06-07 16:52:40 +02:00
Campbell Barton
f0815b1322 Merge branch 'master' into blender2.8 2018-06-07 16:45:34 +02:00
Campbell Barton
863e395ad8 Cleanup: trailing space for windowmanager 2018-06-07 16:43:52 +02:00
Sergey Sharybin
fcc5d7c29e Draw: Fix crash when tryign to get procedural textures with modifier disabled 
Maybe disabled modifier check should be done higher in the call hierarchy.
 2018-06-07 16:40:15 +02:00
Campbell Barton
64e0ab6a00 Merge branch 'master' into blender2.8 2018-06-07 16:32:40 +02:00
Sergey Sharybin
86aaa3efba Fix T55126: COW problem: there is an active object even if unselectable 2018-06-07 16:31:10 +02:00
Campbell Barton
e19686a35a WM: check for release instead of not pressed 
Makes reasoning about events more predictable.
 2018-06-07 16:19:59 +02:00
Bastien Montagne
819ad49d29 Cleanup: typo. 2018-06-07 16:02:55 +02:00
Bastien Montagne
1e4722eeab Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/transform/transform_generics.c
 2018-06-07 15:41:57 +02:00
Bastien Montagne
8a2db3ed21 Fix crash due to missing init of new bAnimContext bmain member in transform code. 
From own previous G.main-busting commit.
 2018-06-07 15:38:31 +02:00
Campbell Barton
d9d3e7778c Fix sculpt mode undo (COW update needed) 2018-06-07 15:15:54 +02:00
Campbell Barton
a3f520170c Merge branch 'master' into blender2.8 2018-06-07 14:58:57 +02:00
Campbell Barton
6242940639 Fix double free in dyntopo-sculpt mode undo 2018-06-07 14:54:09 +02:00
Clément Foucault
a16d835f7b Wireframe: Frustum cull them. 2018-06-07 14:50:01 +02:00
Sergey Sharybin
8366c3ecd8 Depsgraph: Ensure collections are up to date after modifications 
Before that copied collection in copy-on-write were running out
of sync with original ones. This was causing crash with the
following scenario:

- Delete some objects from scene
- Add particle system to an object
- Change particle mode to Hair

Thanks Dalai for debug session! Pair programming ftw!
 2018-06-07 14:41:29 +02:00
Sergey Sharybin
30ec94561c Depsgraph: Use more proper relations for scene relation 2018-06-07 14:41:29 +02:00
Campbell Barton
da8d33e2e3 Merge branch 'master' into blender2.8 2018-06-07 13:41:32 +02:00
Campbell Barton
5330f1c5d1 Fix sculpt assert on initialization 2018-06-07 13:39:49 +02:00