griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,391 Commits 1 Branch 0 Tags
528dc6440bb41e6cbfeea62756ba5ae5debcd27f
Commit Graph

62253 Commits

Author SHA1 Message Date
Campbell Barton
528dc6440b Merge branch 'master' into blender2.8 2018-06-08 22:19:39 +02:00
Campbell Barton
5165d62931 WM: correct recent change to click/drag detection 
fb1915d870 - caused click/drag events not to be detected.

Now check a key is a mouse or keyboard event.
 2018-06-08 22:17:21 +02:00
Campbell Barton
4f2eac3b39 WM: fix panel drag event handling 2018-06-08 19:03:29 +02:00
Campbell Barton
bf77efb684 WM: fix node link & background drag 2018-06-08 19:03:29 +02:00
Campbell Barton
1857823839 WM: fix panel drag event handling 2018-06-08 18:58:41 +02:00
Campbell Barton
2dc7555522 WM: fix node link & background drag 2018-06-08 18:55:47 +02:00
Dalai Felinto
f8d7df6f16 Depsgraph: Remove no longer needed nodetree values copying on eval 
Note: Depsgraph still calls the nodetree eval function that doesn't
nothing in turn. We can remove it, but it is harmless though.
 2018-06-08 17:52:49 +02:00
Campbell Barton
f2fd5987d0 UI: clear properties color when empty 2018-06-08 17:30:00 +02:00
Bastien Montagne
3e86bb2d0b Sculpt/Paint: move PBVH building to use evaluated mesh instead of deprecated Derivedmesh. 
Pretty straightforward changes, merely mimicking dm-related code,
which was already essentially using either Mesh or BMesh data to
build the PBVH...

Note that we "lose" the subsurf (a.k.a. grid) PBVH case here, but that
one was already dead code in current blender2.8, since final dm is
always a cddm built from evaluated mesh.

Proper fix is pending new code for subsurf/multires area.
 2018-06-08 17:23:25 +02:00
Campbell Barton
1ce55693f5 UI: remove tools space type, use properties context 
We've decieded to use tools context in properties editor.
 2018-06-08 16:35:05 +02:00
Dalai Felinto
9d59d20957 DRW: Fix animated material not refreshing 
This introduces a garbage collection system similar to gpu_texture.
 2018-06-08 16:29:33 +02:00
Sergey Sharybin
0417f205f5 Fix crash with wertex and weight modes 
Similar to recent sculpt mode.
 2018-06-08 16:24:07 +02:00
Dalai Felinto
f638ad61b8 Rename: GPU_material_get_uniform_buffer > GPU_material_uniform_buffer_get 2018-06-08 16:20:34 +02:00
Dalai Felinto
856a79e1fb Rename: GPU_texture_orphans 2018-06-08 16:20:34 +02:00
Jeroen Bakker
cbbf8bbbb4 Workbench: XFlip Matcap per 3D View 
Note: Icons are not yet updated.
 2018-06-08 16:13:49 +02:00
Julian Eisel
fc85096dc8 Fix T55387: Render fullscreen from top menu crashes Blender 
Would try to use data from global area for the newly created fullscreen area.
This should not happen, so instead of a global area use first area from layout.
 2018-06-08 15:59:34 +02:00
Sybren A. Stüvel
4df45e18dc Alembic: replaced BLI_assert() with comment why the assert is wrong 
The comment also hints at what should be fixed, instead.
 2018-06-08 15:51:49 +02:00
Sybren A. Stüvel
249a41bc7c Alembic: slight clarifications 2018-06-08 15:51:49 +02:00
Sybren A. Stüvel
ba31c4d684 Alembic export: get evaluated object when exporting shape 2018-06-08 15:51:49 +02:00
Sybren A. Stüvel
2a771cbc58 Alembic: Moved a BLI_assert 
The assert should only be triggered when assigning a pointer, and not
simply when checking the pointer.
 2018-06-08 15:51:49 +02:00
Sybren A. Stüvel
335e030753 mesh_get_eval_final() should check ob->runtime.mesh_eval 
It has nothing to do with ob->derivedFinal, which it checked before.
 2018-06-08 15:51:49 +02:00
Bastien Montagne
934b9e80d0 Add check in BKE_pbvh_apply_vertCos that number of deforming cos matches number of pbvh vertices. 
This shall help catching issues in future.
 2018-06-08 15:43:57 +02:00
Sergey Sharybin
06357b23a2 Fix T55404: Auto key with only-available doesn't work 2018-06-08 15:43:04 +02:00
Sybren A. Stüvel
0dd9a9e66a Alembic: fixed MSVC incompatibility 2018-06-08 15:09:10 +02:00
Jeroen Bakker
f504306671 Workbench: Default specular settings when no materials are used 2018-06-08 15:07:30 +02:00
Campbell Barton
97e7d9f90b Merge branch 'master' into blender2.8 2018-06-08 14:57:17 +02:00
Campbell Barton
d97df0d0e6 Cleanup: unused var, trailing space 2018-06-08 14:56:09 +02:00
Bastien Montagne
94aa4d1657 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_sequencer.h
	source/blender/blenkernel/intern/sequencer.c
	source/blender/editors/curve/editcurve_paint.c
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c
	source/blender/editors/gpencil/gpencil_utils.c
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/interface/interface_eyedropper_depth.c
	source/blender/editors/render/render_opengl.c
	source/blender/editors/sculpt_paint/paint_image_proj.c
	source/blender/editors/sculpt_paint/sculpt.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/space_view3d/view3d_select.c
	source/blender/editors/space_view3d/view3d_utils.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap.c
	source/blender/python/intern/gpu_offscreen.c
	source/blender/windowmanager/intern/wm_files.c
 2018-06-08 14:38:57 +02:00
Sergey Sharybin
ae3e59fb61 Fix T55380: Crash when getting out of EditMode in some cases 
Derived meshes are to be dead, so soon this code will be removed as well.
 2018-06-08 14:38:01 +02:00
Jeroen Bakker
aff6cc9cf1 Workbench: Lights user pref 2018-06-08 14:30:32 +02:00
Campbell Barton
fb1915d870 Prevent wheel causing spurious click/drag events 2018-06-08 14:09:45 +02:00
Sybren A. Stüvel
33437719c1 Alembic import: fixed memory management for CoW copies of CacheFile blocks 
When a CacheFile datablock is copied to an in-main datablock, it means that
the new copy should be independent of the old copy. In this case certain
properties are reset/duplicated. When it is copied to a no-main datablock,
we assume this is a copy-on-write copy that's used for evaluating things,
in which case the handle and object paths are referenced instead of
reset/ duplicated. This prevents us from re-opening the Alembic file every
time a new CoW copy is made.

The same approach is taken when freeing data (only when an in-main datablock
is freed do we actually free the data).
 2018-06-08 13:52:53 +02:00
Sybren A. Stüvel
0c7fc3a961 Alembic import: assign cache_file handle to original datablock 2018-06-08 13:52:53 +02:00
Bastien Montagne
7b6af843c2 Cleanup: getting rid of G.main. 
Sometimes one needs a *lot* of changes for a single G.main... :/
 2018-06-08 12:17:22 +02:00
Sergey Sharybin
c5904574cb Fix T55391: Anim render only shows scene state at current frame (no animation) 2018-06-08 12:12:52 +02:00
Jeroen Bakker
3926ec6aa1 Studiolight: Segment when using float based matcaps 2018-06-08 12:11:05 +02:00
Sergey Sharybin
1f1e26f1ab Depsgraph: Fix missing relations when camera has drivers 2018-06-08 12:04:53 +02:00
Sergey Sharybin
d38c7db5e1 Depsgraph: Cleanup, make conditions more clear and less indented 2018-06-08 11:57:16 +02:00
Sergey Sharybin
4017b48331 Depsgraph: Don't optimize out collections used by duplication system 
This makes evaluated objects to point to a non-evaluated collection,
which is already really bad. What is even more worse, objects in those
collections are not evaluated either.

Proper solution would be to implement visibility flag for nodes, which
will be set to 0 for transform/geometry components, but which will be
1 for copy-on-write components.

This way we will guarantee consistency of dependency graph.

For now this change is good enough and unlocks production.

Fixes T55375: Crash when changing visibility of instanced collection
Fixes T55357: Particle geometry crash
 2018-06-08 11:57:16 +02:00
Sergey Sharybin
378e42e119 Depsgraph: Cleanup, indentation 2018-06-08 11:57:16 +02:00
Sergey Sharybin
9600c7cb05 Depsgraph: Cleanup, make conditions more clear and less indented 2018-06-08 11:57:16 +02:00
Sybren A. Stüvel
691282e571 Alembic export: create render-evaluated depsgraph for exporting 
Previously the context depsgraph was used, which (most likely) uses
viewport evaluation instead of render evaluation.
 2018-06-08 11:53:03 +02:00
Campbell Barton
346a1d445e Cleanup: redundant check 2018-06-08 11:28:42 +02:00
Campbell Barton
0297274720 Merge branch 'master' into blender2.8 2018-06-08 10:54:51 +02:00
Campbell Barton
dff8a7db73 Fix regression in grease pencil drawing 
Drag events finished drawing early.
 2018-06-08 10:52:49 +02:00
Jeroen Bakker
b3c8ffcb3e Workbench: UI for custom studio lights/matcaps 
- all known image types are supported
- BpyAPI for studiolights added
- added open user pref operator in shading menu
- possible to add multiple files in a single run

For now refreshing studio lights will free all studiolights and reinit
the whole mechanism. This can be improved by only freeing deleted, reset
updated and add new custom studiolights.

details to show currently only shows the path we perhaps want to add
other information also
 2018-06-08 10:41:24 +02:00
Campbell Barton
4d16d00154 Keymap: continued testing/development (search key) 
Use Accent/Grave for search, to be more convenient than F-Keys.

This sets F3 back to what it was before.
 2018-06-08 10:07:41 +02:00
Campbell Barton
3d681108bf Merge branch 'master' into blender2.8 2018-06-08 08:50:13 +02:00
Campbell Barton
20367898fe Fix T55301: Transform confirm on release fails w/ MMB 2018-06-08 08:48:21 +02:00
Campbell Barton
e3fe8ce00b WM: backport event/keymap type util from 2.8 2018-06-08 08:46:31 +02:00