griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
78,084 Commits 1 Branch 0 Tags
cfb50463bef8a5c91daaa48cb0e84c4f6bb65ea7
Commit Graph

3449 Commits

Author SHA1 Message Date
Bastien Montagne
e97237892c Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/gpu/GPU_draw.h
	source/blender/gpu/GPU_material.h
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/makesrna/intern/rna_userdef.c
	source/blender/windowmanager/intern/wm_files_link.c
	source/blender/windowmanager/intern/wm_init_exit.c
	source/creator/creator_args.c
	source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
	source/gameengine/Ketsji/KX_PythonInit.cpp
	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
 2018-06-25 12:50:32 +02:00
Bastien Montagne
8a7f317666 Cleanup: Nuke most of G.main from GPU code. 2018-06-25 12:32:48 +02:00
Campbell Barton
85c1e61375 UI: Add user defined context menu 
- Add/Remove from RMB context menu.
- Stored in user preferences.
- Access from Q key.

See T55027.
 2018-06-23 20:52:47 +02:00
Campbell Barton
4ddb03ba79 Keymap: Add F3 key back for search 
Keeping tilder, adding back F3 since some platforms
still don't have hardware scan-codes for tilder key on non-US keyboards.
 2018-06-23 16:25:29 +02:00
Campbell Barton
4f83fd4cf8 Merge branch 'master' into blender2.8 2018-06-21 19:29:22 +02:00
Campbell Barton
68f4a4641e Fix T55568: second click event ignored 2018-06-21 19:26:21 +02:00
Campbell Barton
51f6b25afd Revert "Fix T55568: second click event ignored" 
This reverts commit 52aa963f0e.

Fixed for keyboards, broke mouse buttons.
 2018-06-21 19:24:53 +02:00
Antonioya
c45a3b80e2 Fix T55555: Crash when select material properties 
This error is only in Windows and Mac when select in properties the material tab.

This commit revert dc856be839 Preview: Add own opengl context to render preview images.
 2018-06-21 16:11:29 +02:00
Campbell Barton
52aa963f0e Fix T55568: second click event ignored 
Double-click handling caused the second click to be ignored
for keymaps that only handle click.
 2018-06-21 14:04:43 +02:00
Campbell Barton
9b91e727be Merge branch 'master' into blender2.8 2018-06-21 11:10:37 +02:00
Campbell Barton
b681461c84 Fix T55568: second click event ignored 
Double-click handling caused the second click to be ignored
for keymaps that only handle click.
 2018-06-21 11:07:52 +02:00
Campbell Barton
66263905ae Merge branch 'master' into blender2.8 2018-06-21 10:32:16 +02:00
Campbell Barton
3995b33a42 WM: don't make LMB a special case for double click 2018-06-21 09:49:30 +02:00
Joshua Leung
876c73c9af Cleanup: Move logic for initialising a new Drivers editor into its own function 
This shouldn't really be part of the windowmanager code. Pulling it out
now, so that we can reuse in RNA when switching display modes,
(and perhaps other places later)
 2018-06-21 16:58:14 +12:00
Brecht Van Lommel
4234cddda9 Objects: support for hiding all objects in a collection. 
In the outliner there are now icons for it, Ctrl+Click isolates a
single collections.

In the 3D view, Ctrl+H key opens a menu that is more or less the
equivalent of the old layer buttons in the header. Regular Click isolates
the collection, Shift+Click toggle the collection visibility. Pressing
number keys and letters works in this menu, which can help for quickly
selecting a specific collection.

Shortcuts for quick switching by just pressing 1/2/3/.. keys are available
again. The order can be confusing with nested collections, but that seems
unavoidable. The first numbers control the top level collections, and then
sub collections if numbers are left.

Remaining design issues:

* The 3D view menu needs to be improved: support for sub collections,
  staying open on shift+click, access from the 3D view header somewhere,
  shortcut key display.
* Currently collection hiding just controls per-object hiding, we plan
  to separate this state still so alt+H doesn't affect collection hiding.
 2018-06-20 13:04:51 +02:00
Jeroen Bakker
e3052ecb0d Studiolight: removed raise condition 
Happened when deleting many studiolights at the same time when the
previews were still beging calculated in the background.

Added a free function callback that is filled when the preview is being
generated. This free function will then kill the preview job

This patch also removes icons that are not valid anymore so the user
cannot accidentally render an icon where the studiolight is invalid.

In the end we should use a add/remove function in the studiolight as
currently icons are recalculated too much.
 2018-06-20 09:29:40 +02:00
Campbell Barton
5b227c420b Fix animation player drawing wrong size 2018-06-19 18:03:08 +02:00
Campbell Barton
1c6ca9dc90 Fix animation player 2018-06-19 16:13:23 +02:00
Jeroen Bakker
4b5f3690bb Missed warning in previous commit 2018-06-19 14:07:21 +02:00
Campbell Barton
56173e512c Merge branch 'master' into blender2.8 2018-06-17 16:18:15 +02:00
Campbell Barton
a0a1fc8938 Cleanup: BLI path extension API 
Use BLI_path_extension_* prefix.
 2018-06-17 16:13:24 +02:00
Campbell Barton
2291ce9f1f Merge branch 'master' into blender2.8 2018-06-15 19:12:44 +02:00
Campbell Barton
2b9edbc98b WM: suppress drag events if motion is handled 2018-06-15 19:09:43 +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
dc856be839 Preview: Add own opengl context to render preview images. 2018-06-14 18:17:28 +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
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
98e0bd90f4 WM: hide internal operator settings 
These are set in the interface and aren't useful to show to users.

Other minor changes

- Rename 'Ruler/Protractor' -> 'Ruler'
- Rename Subdivide 'Quad/Tri Mode' -> 'Create N-Gons' (and invert).
 2018-06-12 22:00:22 +02:00
Brecht Van Lommel
376bc88dc0 Fix leak of manipulator tooltip timers. 
This was causing performance degradation over time in posing, as the
manipulator recomputes the center locations for every event.

Ref T55442.
 2018-06-12 17:07:18 +02:00
Campbell Barton
8826a00482 WM: HUD was disappearing on redo 2018-06-12 16:59:37 +02:00
Campbell Barton
2a3e7fe656 UI: improve HUD ensure/clear logic 
Running operators w/o redo now clears the HUD immediately.
 2018-06-12 16:50:27 +02:00
Bastien Montagne
ec4ce908db Fix T55452: Crash on saving with visible particle system. 
Missing Main pointer in recent refactor/cleanup of G.main usages...
 2018-06-12 16:17:05 +02:00
Campbell Barton
4bf331c0fc UI: Initial persistent floating redo panel 
This is the first step to moving redo out of the top-bar, see: T55039

- Support for floating panels in the ScrArea has been added.
- A new region type RGN_TYPE_HUD is used for floating settings input.
- Only one HUD should be visible at a time.
- Currently HUD regions are only visible
  for 3D view and image space types.
- There are currently some remaining glitches with hide/show
  that need further investigation.
 2018-06-12 10:42:49 +02:00
Bastien Montagne
204c167c72 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c
 2018-06-11 16:02:46 +02:00
Bastien Montagne
78a8d3685b Cleanup: remove moar ugly G.main usages... 
BKE_image was an ugly nest, could fix all but the ones from compositor,
so moved ugly G.main there, at least we know where the Evil is that way ;)
 2018-06-11 15:40:37 +02:00
Campbell Barton
a68bed06f6 Merge branch 'master' into blender2.8 2018-06-10 12:11:16 +02:00
Campbell Barton
d0a16772ad WM: add macros to check mouse button/gesture/wheel 
Use to check click/drag,
fixes issue with mouse wheel triggering pie menu.
 2018-06-10 12:08:09 +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
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
Dalai Felinto
856a79e1fb Rename: GPU_texture_orphans 2018-06-08 16:20:34 +02:00
Campbell Barton
97e7d9f90b Merge branch 'master' into blender2.8 2018-06-08 14:57:17 +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
Campbell Barton
fb1915d870 Prevent wheel causing spurious click/drag events 2018-06-08 14:09:45 +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
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
e3fe8ce00b WM: backport event/keymap type util from 2.8 2018-06-08 08:46:31 +02:00