528dc6440b
Merge branch 'master' into blender2.8
2018-06-08 22:19:39 +02:00
5165d62931
WM: correct recent change to click/drag detection
...
fb1915d870
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
97e7d9f90b
Merge branch 'master' into blender2.8
2018-06-08 14:57:17 +02:00
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
fb1915d870
Prevent wheel causing spurious click/drag events
2018-06-08 14:09:45 +02:00
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
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
e3fe8ce00b
WM: backport event/keymap type util from 2.8
2018-06-08 08:46:31 +02:00
30cd35a37b
Keymap: continued testing/development
...
After testing in the studio and extending the event system for
drag events, we've agreed on adjustments to the new keymap,
see: T55162
- Tab: Edit-mode toggle.
- Tab + Cursor Drag: mode switching pie menu.
- Accent/Grave: for 3D view pie menu.
- F3: Search
- 1..3, Shift-1..3: Edit mesh vertex/edge/face toggle.
Other minor changes were made, however they aren't part of the design.
- Ctrl-Shift-S: Image editor Save-As (was F3)
- Ctrl-Alt-R: Repeat history (was F3)
2018-06-07 20:46:12 +02:00
cfc4805455
Merge branch 'master' into blender2.8
2018-06-07 20:41:10 +02:00
8f49299134
WM: fix drag events applying after release
2018-06-07 20:39:17 +02:00
3823287179
Merge branch 'master' into blender2.8
2018-06-07 17:08:55 +02:00
d274c64d22
WM: add support for drag events
...
This allows for a single key to be mapped to both release and drag,
useful for pie menus to share a key with a different action.
2018-06-07 17:06:01 +02:00
8dc33a81b0
Merge branch 'master' into blender2.8
2018-06-07 16:53:31 +02:00
df4525d1d9
Fix key repeat events resetting the click timer
2018-06-07 16:52:40 +02:00
f0815b1322
Merge branch 'master' into blender2.8
2018-06-07 16:45:34 +02:00
863e395ad8
Cleanup: trailing space for windowmanager
2018-06-07 16:43:52 +02:00
cdbda1c3d8
GPUPass: Refactor gpupass caching system to allow fast gpumaterial creation.
...
This is part of the work needed to refactor the material parameters update.
Now the gpupass cache is polled before adding the gpumaterial to the
deferred compilation queue.
We store gpupasses in a single linked list grouped based on their hashes.
This is not the most efficient way but it can be improved upon later.
2018-06-07 12:02:42 +02:00
54f9cd5283
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
0ee4785675
Cleanup: get rid of just-added G.main usage.
...
Was just added to ease merging of master, proper code now!
2018-06-06 16:32:09 +02:00
bb7202495a
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-06 16:25:28 +02:00
48e871ab1d
Cleanup: Nuke moar G.main usages...
2018-06-06 15:50:24 +02:00
274453ef73
Error in recent popover keep_open option
2018-06-06 09:43:03 +02:00
52502ad0a4
UI: WM_OT_call_panel option to keep popovers open
2018-06-06 09:24:51 +02:00
7ff07ddd01
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/windowmanager/intern/wm_files.c
2018-06-05 17:56:18 +02:00
1628a6858e
Fix crash in owmn previous commit.
2018-06-05 17:54:53 +02:00
f0d9dbae0d
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/voxeldata.c
2018-06-05 17:02:50 +02:00
481cdb08ed
Cleanup: use new accessors to blendfile path (Main.name).
2018-06-05 16:33:46 +02:00
6c6c4da718
GPU: Fix texture being freed in threads without ogl context bound.
...
This is a dirty fix. A bit more cleaner approach would be to check if a
context is bound and delay the deletion only in this case.
Also we may want to do this orphan deletion at some other places than
wm_window_swap_buffers.
2018-06-02 21:16:40 +02:00
9cd2e4fa3f
Cleanup: quiet warnings w/o Python
2018-06-02 13:10:27 +02:00
b608133075
Fix crash if no tool is set
2018-06-02 13:10:15 +02:00
bfe1d0e0dc
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
75fc1c3507
Cleanup: trailing whitespace (comment blocks)
...
Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
eb1feb9f4a
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_select.c
source/blender/editors/space_outliner/outliner_edit.c
2018-05-31 16:21:47 +02:00
16100f8261
Cleanup: get rid of last G.main usages in BKE library code.
2018-05-31 16:04:04 +02:00
81bf9a41e1
Tool System: Utility to set the tool by name
...
Wrapper for the Python operator.
2018-05-31 09:02:43 +02:00
0b6603d9b6
Fix selection randomly failing with border render.
...
We no longer user scissor for 3D viewport drawing, and some selection
code assumed it still. This also cleans up unnecessary scissor test
switching, we only have it temporarily enabled now.
2018-05-30 19:34:12 +02:00
e9cd2fb23b
Keymap: partially implement changes from T55162
...
- Use Tab key for search.
- Number keys switch modes.
- The number of the current mode can open a submode menu
(currently only works for edit-mode)
- Ctrl-Tab, Ctrl-Shift-Tab - cycle workspaces.
2018-05-29 17:52:27 +02:00
b11a1d5da2
UI: support for a popup panel which stays open
2018-05-25 12:55:22 +02:00
08da2826e0
Merge branch 'master' into blender2.8
2018-05-25 10:52:53 +02:00
9812943931
WM: check modal handlers for keymap lookups
...
Keep in sync with 2.8x
2018-05-25 10:51:05 +02:00
230943be2d
Fix 3D Cursor w/ interface scale
2018-05-25 10:07:28 +02:00
39aea50155
Fix T55178: Cursor fails to restore on cancel
...
574c0fe38f
2018-05-24 14:23:32 +02:00
Julian Eisel
6f20fcd598
UI: Global "Status-bar" Area (WIP)
...
* Add horizontal bar at bottom of all non-temp windows, similar to the Top-bar.
* Status-bar is hidden in UI-less fullscreen mode
* Current contents are preliminary and based on T54861:
** Left: Current file-path if needed. "(Modified)" note if file was changed.
** Center: Scene statistics (like in 2.7 Info Editor).
** Right: Progress-bars and reports
* Internally managed as own "STATUSBAR" editor-type (hidden in UI).
* Like with the Top-bar, Status-bar data and SDNA writing is disabled.
* Most changes in low-level screen/area code are to support layout bounds that differ from window bounds.
Design task: T54861
Main changes approved by @brecht .
2018-05-23 22:38:25 +02:00
6955add502
Fix T55166: crash joining areas
...
Caused by own commit 6e40b2de7a
2018-05-23 20:25:55 +02:00
933a083587
UI: popup panel operator, as we have for menus
2018-05-23 19:48:28 +02:00
1c572b7412
Fix T55161: outliner Blender File with filter showing irrelevant libraries.
2018-05-23 14:43:24 +02:00
44f78c95be
Cleanup: move toolsystem into own include
...
Many files using the window manager don't access the tool-system.
This avoids rebuilding many files when the tool-system changes.
2018-05-23 08:23:16 +02:00
