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

62494 Commits

Author SHA1 Message Date
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
Jeroen Bakker
17b029d80e T55406: Flip Matcap 
- Icon represent the flipped matcap in the shading menu
- Added template_icon to display any icon in scale.
 2018-06-14 11:44:36 +02:00
Bastien Montagne
0eb3246713 Fix T55470: Add option to not fix polygons' winding to Edit Normals modifier. 
this is actually adding option to add buggy behavior, but.. NPR often
expects buggy behaviors, and its one of the main targets for normal editing.
So think it's reasonable to add that option (disabled by default of
course).

Note that am not really happy with UI, but:
* Not sure where to put it, it's kind of own self-contained area option.
* Don't to make it too much visible, using this should be the exception!
 2018-06-14 11:41:12 +02:00
Campbell Barton
fecec7dd68 3D View: Show view-aligned rotation manipulators 2018-06-14 11:37:47 +02:00
Campbell Barton
f35572ae9e Cleanup: style 2018-06-14 11:37:47 +02:00
Clément Foucault
62f594ca7b UI: Make spacers align blocks on area divisions 
This solves the problem of blocks jumping around when changing modes and
center them to the area (in case of only 2 spacers).
Which is (in my own opinion) more aestetically pleasing.
 2018-06-14 11:29:44 +02:00
Campbell Barton
7449dc8d13 3D View: Tweak transform plane manipulator fading 
The threshold to fade out and hide was too small.
 2018-06-14 10:39:36 +02:00
Campbell Barton
4ee97c9a1c WM: increase hot-spot of 3D manipulators 
Larger hot-spot was disabled for performance,
however without this - clicking on them is too difficult.
 2018-06-14 09:55:58 +02:00
Campbell Barton
ba2c10c1f7 3D View: increase size of view aligned rotation 
Minor changes based on user feedback.

- View aligned rotation manipulator overlapped too often
  with axis aligned widgets. Increase size (matching 2.79)
- Offset arrow-heads when combining rotate & translate,
  don't draw the stem since it overlaps with scale.
 2018-06-14 09:46:11 +02:00
Campbell Barton
22ac20a705 WM: option not to draw arrow manipulator stem 2018-06-14 09:25:55 +02:00
Campbell Barton
eeca206e76 Cleanup: rename arrow manipulator 'draw_options' 
Rename to 'transform' since this controls interaction.
 2018-06-14 09:17:03 +02:00
Campbell Barton
b839d67f3e UI: correct HUD zoom resetting 2018-06-14 08:30:46 +02:00
Clément Foucault
2f3e890b94 DRW: Fix crash caused by hair transform feedback 
Seem to be cause by the lack of proper FBO bound.
 2018-06-13 22:20:48 +02:00
Campbell Barton
8d2309f94f 3D View: make navigation buttons smaller 
Keep orbit large, other buttons are now closer to other icons buttons.
 2018-06-13 21:00:05 +02:00
Brecht Van Lommel
711a50c5ea Merge branch 'master' into blender2.8 
This includes making Eevee match Cycles behavior of inserting an emission
node when linking colors to closures.
 2018-06-13 19:26:52 +02:00
Brecht Van Lommel
4d58fac1b4 Fix undo group to use human readable name, since this shows in the UI. 2018-06-13 18:39:30 +02:00
Brecht Van Lommel
3102833962 Fix undo of transform after frame change undoing too much. 
For grouped undo we should not skip the undo push, rather replace the
previous undo push. This way undo goes back to the state after the last
operation in the group.
 2018-06-13 18:39:30 +02:00