b88e51dd55
Cleanup: use bool for poll functions
2018-07-02 11:51:31 +02:00
b4998548ab
Cleanup: use '_len' suffix for line stipple
2018-07-01 08:42:16 +02:00
8e02106d0d
GLRefactor: partially remove gl calls from source/blender/editors.
...
This translates the gl calls to the new GPU_ wrappers from D3501.
Given it's tedious and repetitive work, this patch does as much as it can with search + replace, the remainder of the gl calls will need to be manually dealt with on a case by case basis.
This fixes 13 of the 28 failing editors when building without opengl.
For the list of substitutions see D3502
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3502
2018-06-27 19:07:23 -06:00
43ce201125
Merge branch 'master' into blender2.8
2018-06-17 11:57:49 +02:00
42103a3eb8
CMake: add missing headers
2018-06-17 11:56:20 +02:00
5b6ae0523e
Merge branch 'master' into blender2.8
2018-06-15 17:25:41 +02:00
da9b1b14ed
Cleanup: some more G.main removal/validation...
2018-06-15 17:21:07 +02:00
160cb9a284
Merge branch 'master' into blender2.8
...
Conflicts:
intern/cycles/blender/blender_object.cpp
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mball.cc
source/blender/alembic/intern/abc_mball.h
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_mball.h
source/blender/blenkernel/BKE_mball_tessellate.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/smoke.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/ed_util.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-11 14:39:38 +02:00
8055ed2741
Cleanup: remove some G.main usages...
2018-06-11 12:15:14 +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
95011f6d48
Merge branch 'master' into blender2.8
2018-06-04 09:39:04 +02:00
44505b38df
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +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
e44743736f
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-01 17:26:36 +02:00
051e186d5c
Cleanup: some more G.main removal from editor code.
2018-06-01 17:08:38 +02:00
17f458ff32
Merge branch 'master' into blender2.8
2018-05-31 11:08:02 +02:00
24d1829243
Cleanup: nuke G.main out of BKE PackedFile code.
2018-05-31 11:07:14 +02:00
cc7460eaa4
Fix multi-edit mode on file load
...
Setting up the initial object mode would change objects which were
already moved into their mode along with the active object.
2018-04-25 15:29:20 +02:00
9e2ea6c500
Merge branch 'master' into blender2.8
2018-04-15 12:03:09 +02:00
c12d976020
Cleanup: ED_armature naming
...
- Wasn't clear which functions handle edit-bones.
- Mixed both ebone and edit_bone in names.
- Didn't use ED_armature_* prefix for public API.
See P655 to apply to branches.
2018-04-15 11:50:53 +02:00
1c24c04e60
Remove workspace object mode, reverts changes w/ 2.8
...
This caused too many problems syncing object modes
with multiple objects/windows/workspaces, see: D3130 for details.
2018-04-05 18:21:14 +02:00
89fdd88906
Merge branch 'master' into blender2.8
2018-04-02 15:18:10 +02:00
4ffa05c30b
Cleanup: move undo into it's own directory
...
Split out undo API from ED_util.h into ED_undo.h
2018-04-02 15:07:40 +02:00
c0eab1fde5
Workaround for undo steps not storing object modes
2018-04-01 19:33:02 +02:00
b65ea517eb
Merge branch 'master' into blender2.8
...
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
2018-04-01 11:03:25 +02:00
651b8fb14e
Undo: unified undo system w/ linear history
...
- Use a single undo history for all operations.
- UndoType's are registered and poll the context to check if they
should be used when performing an undo push.
- Mode switching is used to ensure the state is correct before
undo data is restored.
- Some undo types accumulate changes (image & text editing)
others store the state multiple times (with de-duplication).
This is supported by checking UndoStack.mode `ACCUMULATE` / `STORE`.
- Each undo step stores ID datablocks they use with utilities to help
manage restoring correct ID's.
Needed since global undo is now mixed with other modes undo.
- Currently performs each undo step when going up/down history
Previously this wasn't done, making history fail in some cases.
This can be optimized to skip some combinations of undo steps.
grease-pencil is an exception which has not been updated
since it integrates undo into the draw-session.
See D3113
2018-03-31 20:40:37 +02:00
891c1cfc9a
C Logging: use instead of printf for messages
...
- See `--log` help message for usage.
- Supports enabling categories.
- Color severity.
- Optionally logs to a file.
- Currently use to replace printf calls in wm module.
See D3120 for details.
2018-03-30 18:57:41 +02:00
5e81d993af
Merge branch 'master' into blender2.8
2018-03-19 18:14:05 +01:00
c78ebf9f26
Cleanup: split lattice into own library
...
Was mixed with object functionality.
2018-03-19 15:45:50 +01:00
585208e0e9
Merge branch 'master' into blender2.8
2018-03-14 02:15:37 +11:00
bf8f5f5142
Cleanup: doxygen comments
2018-03-14 02:08:07 +11:00
49baf15a35
Merge branch 'master' into blender2.8
2018-03-07 14:31:53 +11:00
737a5efff4
Cleanup: edit-mode undo API
...
Move function descriptions into the struct,
minor improvements to variable naming,
use convention of 'g_' prefix for static vars.
2018-03-07 14:00:02 +11:00
da2d0fe43a
Merge branch 'master' into blender2.8
2018-03-02 14:46:21 +11:00
4913e47aa0
Merge branch 'master' into blender2.8
2018-03-02 14:09:27 +11:00
ff74357da0
Object Mode: move logic to 'object_modes.c'
...
Was mixed with edit-mode, centralize mode switching in a single file.
No functional changes.
2018-03-02 14:00:47 +11:00
341ab45f7b
Fix building w/o Python
...
Also minor cleanup.
2018-03-02 11:17:57 +11:00
026ac65831
WorkSpace: Restore saved object-modes again
...
Was temporarily removed when moving object mode to workspace.
Note: there is an issue where eval_ctx->view_layer is NULL on load,
for now pass a view layer argument, we might wan't to set the value
instead.
2018-02-22 15:52:30 +11:00
7f65ab86e5
Cleanup: sync vertex-paint and sculpt from 2.8
...
Sync API changes from 2.8 to master.
2018-02-19 15:54:06 +11:00
18bb0bc569
Object Mode: exit sculpt on selection
2018-02-17 00:01:25 +11:00
8234f24838
Object Mode: Loop over objects for ED_editors_exit
...
We could loop over active objects but this ensures don't miss any
and avoids complicated context checks.
2018-02-13 21:00:26 +11:00
5db950e860
Cleanup: use workspace for object_mode when possible
2018-02-09 22:14:39 +11:00
345c6298e9
Object Mode: move to workspace struct
...
- Read-only access can often use EvaluationContext.object_mode
- Write access to go to WorkSpace.object_mode.
- Some TODO's remain (marked as "TODO/OBMODE")
- Add-ons will need updating
(context.active_object.mode -> context.workspace.object_mode)
- There will be small/medium issues that still need resolving
this does work on a basic level though.
See D3037
2018-02-08 21:14:26 +11:00
5ec016169b
Object Mode: use eval_ctx for context/screen code
2018-02-06 18:03:28 +11:00
a1c45a453f
Merge branch 'master' into blender2.8
2018-02-05 17:58:31 +11:00
f911fb0744
Minor change to last commit
...
Keep mode checks simple, nest other checks in their body.
2018-02-05 17:56:09 +11:00
ceb645bc56
Fix T53986: Crash saving during sculpt stroke
...
Also remove unused struct member.
2018-02-05 17:54:13 +11:00
deaeee8e4d
Merge branch 'master' into blender2.8
2017-12-05 11:48:37 +01:00
