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
Bastien Montagne
da9b1b14ed Cleanup: some more G.main removal/validation... 2018-06-15 17:21:07 +02:00
Sybren A. Stüvel
ed3d693cb1 Dependency graph fixes for RigidBodyWorld 
- rbw->group added to the depsgraph.
- Mesh evaluation added when necessary.
- Prevent of double-free by freeing the scene before objects.
 2018-06-15 17:15:42 +02:00
Campbell Barton
43d22d80e7 Keymap: use click event for tab-key 
Checking release events would toggle edit-mode during alt-tab
cycling on X11.

Now both press and release events are needed.
 2018-06-15 17:10:40 +02:00
Jeroen Bakker
d148514821 Workbench: Disable AA when doing opengl render. 
- OpenGL uses linear space and has its own AA. So we don't calculate
when doing opengl rendering.
 2018-06-15 16:50:34 +02:00
Dalai Felinto
badb700161 Fix T55443: Manipulators not refreshing 2018-06-15 15:45:21 +02:00
Campbell Barton
0b8c2eed75 Merge branch 'master' into blender28 2018-06-15 15:42:42 +02:00
Campbell Barton
8166d0affd Cleanup: warning 2018-06-15 15:42:31 +02:00
Jeroen Bakker
e552247489 MeshEditMode: refactor 
- added a lib for shaded functions
- decreased active face inner size
 2018-06-15 15:37:13 +02:00
Dalai Felinto
86a2f4a34a Fix crash with x-ray and redo panel 
Code was assuming any area with region data was the main one.
This is no longer the case.
 2018-06-15 15:01:28 +02:00
Howard Trickey
b84fad2ba3 Fix T55490, intersect two triangles fails. 
Need to use the 'use_partial_connect' option in island connect,
so changed signatures of various functions to pass that into and
then down from BM_mesh_intersect (making true for intersect, false
for boolean).
Then fix bm_face_split_edgenet_partial_connect to work when
input edges are not necessarily wire, but at least not in the
face they are being connected in. That caused generalization
of core BM_vert_separate_hflag_wire (which is only used in
this one place in all Blender).
 2018-06-15 08:48:45 -04:00
Sybren A. Stüvel
84c91a87a9 Converted Rigid Body from DerivedMesh to Mesh 2018-06-15 14:33:11 +02:00
Jeroen Bakker
5073ee0bb2 Workbench: FXAA 
- do the FXAA pass after the color management. Be aware that during
rendering this is still being done in linear space
 2018-06-15 14:05:49 +02:00
Jeroen Bakker
0276abbcf7 Workbench: FXAA 
FXAA implementation in the deferred renderpass of the workbench.
Can be enabled per 3dview. Eventually this will also be a user setting
as it is more a system/performance setting than a scene setting.
 2018-06-15 13:02:16 +02:00
Jeroen Bakker
15c340293f T55486: use GPU_R11F_G11F_B10F for target of Xray compo 2018-06-15 13:02:15 +02:00
Jeroen Bakker
64bfa4b300 T55486: use GPU_R11F_G11F_B10F for Matcaps 2018-06-15 13:02:15 +02:00
Bastien Montagne
995a1815f5 Fix T55408: Double transforms on parents/children. 
object.base_flag was not synced back from evaluated ID to original one.
Similar thing as copying back to original transform matrix, avoids
having to get data from evaluated one in lots of cases.
 2018-06-15 12:17:26 +02:00
Philipp Oeser
76bc8669a0 Merge branch 'master' into blender2.8 2018-06-15 10:44:33 +02:00
Philipp Oeser
284e0ea756 Fix (unreported) Text Editor: scrollbar exiting early 
caused by recent clickdrag changes
 2018-06-15 10:27:30 +02:00
Campbell Barton
cbc7ee28d7 WM: 2.8 screen compatibility 
Without these minor changes loading files from 2.8 will crash.

Manually applied edits from 26786a2b87
 2018-06-15 10:24:53 +02:00
Campbell Barton
7c16739c75 Fix mouse input overwriting transform redo values 
Redo trackball rotate and edge slide weren't working.

Caused by re-ordering of initialization 47de0321bf
 2018-06-15 08:48:53 +02:00
Campbell Barton
e2c87c7e94 Cleanup: unused var 2018-06-15 08:03:19 +02:00
Lukas Stockner
525be2f579 Image: Refactor render slots to a dynamic list 
Previously, render slots were hardcoded to a fixed amount.

With this change, render slots now are stored in a list. Therefore, users can add and/or remove as many slots as they want.

Credit to brecht for the UI part.

Reviewers: brecht, sergey

Differential Revision: https://developer.blender.org/D3474
 2018-06-14 22:46:30 +02:00
Campbell Barton
51f1ed8221 Cleanup: style 2018-06-14 22:44:53 +02:00
Campbell Barton
928d31d94a WM: fix redo region setting the context 2018-06-14 22:32:01 +02:00
Campbell Barton
26786a2b87 WM: add support for temporary region data 2018-06-14 22:27:58 +02:00
Campbell Barton
1adfabc8c6 WM: revert part of Top-Bar inclusion 
This removes OperatorRepeatContextHandle, from 5f6c45498c
since we now only have redo in the area an operator is executed in.

These values could be invalid and crashed in some cases.
 2018-06-14 21:58:11 +02:00
Clément Foucault
7afa59e37a Edit Mesh: Fix blending function of edges 
This fix the ugly (usually) dark outline that was around selected edges.
 2018-06-14 21:45:16 +02:00
Brecht Van Lommel
dc25e69c2d Fix motion paths not updating correctly for bones in some cases. 
Sometimes the evaluated pose channel pointers can change during depsgraph
evaluation, so we can't store them ahead of time. The object pointer
should be ok since evaluated ID memory is reused.
 2018-06-14 20:58:14 +02:00
Clément Foucault
dc856be839 Preview: Add own opengl context to render preview images. 2018-06-14 18:17:28 +02:00
Sybren A. Stüvel
a8e8808d58 Give RigidBodyWorld collection a fake user 
This prevents it from disappearing when the blend file is saved.
 2018-06-14 17:35:46 +02:00
Campbell Barton
8dc883052c UI: redo panel would still start zoomed in at times 2018-06-14 16:48:31 +02:00
Bastien Montagne
59bb5d3a89 Cleanup: some remaining G.main's in COllada in 2.8... 2018-06-14 16:43:11 +02:00
Jeroen Bakker
a03fb42841 Workbench: Code cleanup: Double assignment 2018-06-14 16:28:16 +02:00
Bastien Montagne
b9c9b87fa6 Cleanup: remove BLI_frand ugly global random generator usage from compositor. 2018-06-14 16:25:39 +02:00
Campbell Barton
3a36cbdfde Transform: Suppress assert w/ vertex paint 2018-06-14 16:14:51 +02:00
Sergey Sharybin
00eeb05f4c Depsgraph: Make certain components NOT tag copy-on-write when they are tagged 
Currently done for mesh batch cache update, and for base flags sync.
Those components do not need anything from original object, and hence
can skip CoW tag and have faster update after them used.
 2018-06-14 16:04:09 +02:00
Sergey Sharybin
42d8872014 Depsgraph: Use dedicated ocmponent for object's base flags flush 2018-06-14 16:04:09 +02:00
Bastien Montagne
87b2444270 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/AnimationExporter.cpp
	source/blender/collada/AnimationExporter.h
	source/blender/collada/ArmatureImporter.cpp
	source/blender/collada/ArmatureImporter.h
	source/blender/collada/ControllerExporter.cpp
	source/blender/collada/ControllerExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentImporter.cpp
	source/blender/collada/GeometryExporter.cpp
	source/blender/collada/GeometryExporter.h
	source/blender/collada/MeshImporter.cpp
	source/blender/collada/MeshImporter.h
	source/blender/collada/SkinInfo.cpp
	source/blender/collada/SkinInfo.h
	source/blender/collada/collada_utils.cpp
	source/blender/collada/collada_utils.h
 2018-06-14 15:55:51 +02:00
Brecht Van Lommel
0626de2033 GPU: consistenly use mipmap on/off in all draw modes. 
This is important for good texture paint performance.
 2018-06-14 15:50:22 +02:00
Brecht Van Lommel
14db989e73 Cleanup: remove legacy GPU pass binding code. 2018-06-14 15:46:43 +02:00
Jeroen Bakker
39142103d9 T55479: Tag for update when active texture changes 2018-06-14 15:30:06 +02:00
Bastien Montagne
fd19069999 Cleanup: remove last G.main's from Collada code. 2018-06-14 15:15:51 +02:00
Jeroen Bakker
277d901274 T55456 EditMeshMode 
- see the face selection color when face is active
- test different masks for active face, finally chosen for no mask at
all.
 2018-06-14 14:18:52 +02:00
Sybren A. Stüvel
158930228d Improved two tooltips 
Tooltips shouldn't just repeat the information from the label.
 2018-06-14 13:55:24 +02:00
Brecht Van Lommel
f4dc4bd275 Fix crash on startup in after recent G.main changes. 2018-06-14 13:45:15 +02:00
Bastien Montagne
3eba5c0079 Cleanup: remove last G.main's in WM code of 2.8. 
Again, just validating ther usage and using G_MAIN instead.
 2018-06-14 12:42:30 +02:00
Bastien Montagne
4bf751be70 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/modifiers/intern/MOD_normal_edit.c
	source/blender/windowmanager/intern/wm_files.c
 2018-06-14 12:39:52 +02:00
Bastien Montagne
66407e15cb Cleanup: Remove last G.main's from WM code. 
Was mostly validating valid usages of G.main -> G_MAIN actually.
 2018-06-14 12:34:13 +02:00
Jeroen Bakker
a671aa922a Workbench: Material colors + settings during sculpting 2018-06-14 12:12:27 +02:00
Clément Foucault
d64cd6f7ee Move call to drw_state_ensure_not_reused() inside the region locked by DST.gl_context_mutex. 
Currently with a debug build there is a race condition where the mutex is released before the DST structure is reset to 0xFF, meaning when multiple threads are using the DRWManager it can get cleared when the main thread is using it, causing crashes.

Reviewers: fclem, brecht

Reviewed By: fclem

Tags: #bf_blender_2.8

Differential Revision: https://developer.blender.org/D3476
 2018-06-14 12:03:40 +02:00