griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
94,440 Commits 1 Branch 0 Tags
8e8fdf875d080f2bebedf25815768de02147f4be
Commit Graph

75472 Commits

Author SHA1 Message Date
Campbell Barton
5159ce640f Cleanup: style 2018-06-09 16:39:40 +02:00
Bastien Montagne
70f8eaf1b7 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
 2018-06-09 15:18:21 +02:00
Bastien Montagne
638de72277 Cleanup: remove some G.main usages. 2018-06-09 15:17:04 +02:00
Campbell Barton
2ca8230f67 Merge branch 'master' into blender2.8 2018-06-09 14:43:01 +02:00
Campbell Barton
fb565ddb68 Cleanup: trailing space in RNA 2018-06-09 14:40:09 +02:00
Campbell Barton
56a47e58f4 Cleanup: style 2018-06-09 14:30:32 +02:00
Campbell Barton
09ce794dc8 UI: initial support for parent panels in popovers 
Currently this just includes the panels, no support for collapsing yet.
 2018-06-09 14:21:39 +02:00
Campbell Barton
8f40af6dcd RNA: revert object mode re-order 
This was done so numbered shortcuts made sense.
Now order matches master.
 2018-06-09 12:57:15 +02:00
Clément Foucault
3bbef95747 Workbench: Fix xray normal not being normalized. 2018-06-09 12:44:56 +02:00
Clément Foucault
337aab59e9 Workbench: Matcaps: Fix matcap under perspective. 
This fixes the problem that matcaps have when using a very larg FOV in
perspective view.

This was because it was stupidly using the normal direction which can not
aligned with the view vector under perspective.

So to workaround this problem we don't use the normal as is, but compute
how much it's facing the camera.

This changes how matcaps looks in perspective because they now always use
the full range of the matcap (which is expected).
 2018-06-09 12:44:56 +02:00
Clément Foucault
a1b42b79b3 Workbench: Fix incident vector calculation. 
This fixes specular in perspective view.
 2018-06-09 12:44:56 +02:00
Pablo Vazquez
86660aa294 Layout for materials closer to single column 2018-06-08 23:56:39 +02:00
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