Page MenuHome
Differential D6467

Proposed fix for T71497 - Split annotation operators and pointer functions
ClosedPublic
Actions

Authored by Antonio Vazquez (antoniov) on Dec 22 2019, 11:06 AM.

Details

Reviewers
Dalai Felinto (dfelinto)
Matias Mendiola (mendio)
Commits
rBfa3a0697b846: Annotations: Split annotation operators and pointer functions
Summary

This allows to have annotation panels and grease pencil object panel at the same time.

The patch fix main issues:

  1. The get pointer functions were shared between GPencil object and Annotations. Now, these functions are different and the grease pencil version has been simplified.
  1. Some operators were shared and it was impossible detect what mode was running. Now the operators are different, and this allows to use different poll functions, but the exec code is shared using an internal parameter.
  1. The Annotation Tool was not available in GPencil Paint, Sculpt and Weignt Paint modes.

As result of this split, now both panels are visible and the tooltips are different.

Related to T71497 and T72717

Diff Detail

Repository
rB Blender

Event Timeline

Antonio Vazquez (antoniov) created this revision.Dec 22 2019, 11:06 AM
Harbormaster completed remote builds in B6095: Diff 20460.Dec 22 2019, 11:07 AM
Antonio Vazquez (antoniov) retitled this revision from Annotations: Split annotation operators and pointer functions to Proposed fix for T71497 - Split annotation operators and pointer functions.Dec 22 2019, 11:11 AM
Antonio Vazquez (antoniov) edited the summary of this revision. (Show Details)
Antonio Vazquez (antoniov) added reviewers: Dalai Felinto (dfelinto), Matias Mendiola (mendio).
Antonio Vazquez (antoniov) added a project: Grease Pencil.
Antonio Vazquez (antoniov) mentioned this in T71497: Annotations and Grease Pencil panels cannot work at the same time.
Antonio Vazquez (antoniov) edited the summary of this revision. (Show Details)Dec 22 2019, 11:13 AM
Antonio Vazquez (antoniov) edited the summary of this revision. (Show Details)
Antonio Vazquez (antoniov) updated this revision to Diff 20463.Dec 22 2019, 7:28 PM
  • Make Annotation Tool visible in GPencil modes
Harbormaster completed remote builds in B6098: Diff 20463.Dec 22 2019, 7:28 PM
Antonio Vazquez (antoniov) edited the summary of this revision. (Show Details)Dec 22 2019, 7:30 PM
Antonio Vazquez (antoniov) mentioned this in T72717: Grease Pencil – Can't Move Keyframes in Dope Sheet When in Edit Mode.Dec 27 2019, 9:21 AM
Antonio Vazquez (antoniov) updated this revision to Diff 20515.Dec 27 2019, 2:39 PM
  • Fix problems in Dopesheet in Edit mode (T72717)
Harbormaster completed remote builds in B6116: Diff 20515.Dec 27 2019, 2:39 PM
Antonio Vazquez (antoniov) edited the summary of this revision. (Show Details)Dec 27 2019, 2:40 PM
Antonio Vazquez (antoniov) added a subscriber: ronsn.
Matias Mendiola (mendio) accepted this revision.Jan 6 2020, 12:21 PM
This revision is now accepted and ready to land.Jan 6 2020, 12:21 PM
Dalai Felinto (dfelinto) added a comment.Jan 6 2020, 5:59 PM

All the "XXX: see comment for gpencil_data case" should be removed, right?

I haven't tested the patch yet, but anything is better than the current situation ;)

Wondering if we should rename GPENCIL_OT_data_add to what it is. It shows in bpy.ops...

source/blender/editors/gpencil/gpencil_utils.c
103–105

Why is this part of the patch?

Antonio Vazquez (antoniov) added inline comments.Jan 6 2020, 7:56 PM
source/blender/editors/gpencil/gpencil_utils.c
103–105

Because it fix a bug related.

Antonio Vazquez (antoniov) added a comment.EditedJan 6 2020, 7:57 PM

@Dalai Felinto (dfelinto) What name do you propose for GPENCIL_OT_data_add?

Maybe GPENCIL_OT_annotation_add?

Antonio Vazquez (antoniov) updated this revision to Diff 20653.EditedJan 7 2020, 10:42 AM
  • Remove old comments
  • Rename add datablock operator
Harbormaster completed remote builds in B6179: Diff 20653.Jan 7 2020, 10:42 AM
Dalai Felinto (dfelinto) requested changes to this revision.Jan 7 2020, 11:04 AM
Dalai Felinto (dfelinto) added inline comments.
source/blender/editors/gpencil/gpencil_data.c
268

See my comment about is_annotation elsewhere

365

This makes no sense. When would this operator be called for something that is not an annotation?

For the users (Python developers anyways) it shows as:

bpy.ops.gpencil.layer_annotation_remove(is_annotation=True)

Confusing, right? I know what you mean to do, but you need to either have its own dedicated _exec function that then calls gp_layer_remove_exec or to get the operator name (see collection_objects_select_exec).

2227–2229

See other comments re: comments code-style

source/blender/editors/gpencil/gpencil_utils.c
103–105
- case SPACE_TOPBAR:     /* Topbar (needed after topbar merge) */
+ case SPACE_TOPBAR:

Or explain WHY it is needed, that is needed it is obvious given the code itself.

138

See other comments regarding comment code-style

source/blender/editors/screen/screen_context.c
520

Remove the XXX bit

542

Keep the comment in a single line?

547

Use first capital letter with full stop for comments.

- /* get pointer to Grease Pencil Data */
+ /* Get pointer to Grease Pencil Data. */
554–555

Remove this.

This revision now requires changes to proceed.Jan 7 2020, 11:04 AM
Antonio Vazquez (antoniov) updated this revision to Diff 20655.Jan 7 2020, 11:26 AM
  • Fix comments and remove is_annotation parm
Harbormaster completed remote builds in B6180: Diff 20655.Jan 7 2020, 11:26 AM
Dalai Felinto (dfelinto) accepted this revision.Jan 7 2020, 11:28 AM
This revision is now accepted and ready to land.Jan 7 2020, 11:28 AM
Closed by commit rBfa3a0697b846: Annotations: Split annotation operators and pointer functions (authored by Antonio Vazquez (antoniov)). · Explain WhyJan 7 2020, 11:34 AM
This revision was automatically updated to reflect the committed changes.
Antonio Vazquez (antoniov) added a commit: rBfa3a0697b846: Annotations: Split annotation operators and pointer functions.

Revision Contents
Changeset List

PathSize
release/
scripts/
startup/
bl_ui/
32 lines
8 lines
source/
blender/
editors/
gpencil/
4 lines
39 lines
215 lines
38 lines
6 lines
6 lines
135 lines
include/
20 lines
screen/
59 lines

Diff 20656

View Options

release/scripts/startup/bl_ui/properties_grease_pencil_common.py

Loading...
View Options

release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

Loading...
View Options

source/blender/editors/gpencil/annotate_draw.c

Loading...
View Options

source/blender/editors/gpencil/annotate_paint.c

Loading...
View Options

source/blender/editors/gpencil/gpencil_data.c

Loading...
View Options

source/blender/editors/gpencil/gpencil_edit.c

Loading...
View Options

source/blender/editors/gpencil/gpencil_intern.h

Loading...
View Options

source/blender/editors/gpencil/gpencil_ops.c

Loading...
View Options

source/blender/editors/gpencil/gpencil_utils.c

Loading...
View Options

source/blender/editors/include/ED_gpencil.h

Loading...
View Options

source/blender/editors/screen/screen_context.c

Loading...