Page MenuHome
Differential D6759

Fix T64058: Grease Pencil Object saved in editmode is not appended in objectmode correctly
ClosedPublic
Actions

Authored by Antonio Vazquez (antoniov) on Feb 5 2020, 11:02 PM.

Details

Reviewers
Bastien Montagne (mont29)
Philipp Oeser (lichtwerk)
Maniphest Tasks
T64058: Grease Pencil Object saved in editmode is not appended in objectmode correctly [cannot be moved and causes assert]
Commits
rB342ceba5bf6e: Fix T64058: GPencil - Ensure object mode if linking from a library
rBb4f8e3f01bc9: Fix T69776: Error with complex Eevee noise texture in some drivers
Summary

Looks like we need to make sure GP_DATA_STROKE_EDITMODE flag is cleared,
otherwise this will be picked up by GPENCIL_EDIT_MODE() and will be
interpreted as being in editmode in a couple of places (e.g. transform
context will be set incorrectly to CTX_GPENCIL_STROKES).

Not sure if this is the best place for this?
(I've looked at 'direct_link_gpencil' or 'lib_link_gpencil' but these
are also called when opening a file, so we dont want to loose proper
editmode in that case...)

Diff Detail

Repository
rB Blender

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Feb 5 2020, 11:02 PM
Harbormaster completed remote builds in B6501: Diff 21430.Feb 5 2020, 11:02 PM
This revision was not accepted when it landed; it landed in state Needs Review.Feb 6 2020, 2:59 AM
Closed by commit rBb4f8e3f01bc9: Fix T69776: Error with complex Eevee noise texture in some drivers (authored by Patrick Bender (ichbinkeinreh), committed by Germano Cavalcante (mano-wii)). · Explain Why
This revision was automatically updated to reflect the committed changes.
Germano Cavalcante (mano-wii) added a commit: rBb4f8e3f01bc9: Fix T69776: Error with complex Eevee noise texture in some drivers.
Germano Cavalcante (mano-wii) reopened this revision.Feb 6 2020, 3:01 AM
Germano Cavalcante (mano-wii) added a subscriber: Germano Cavalcante (mano-wii).

Oops sorry, I will fix!

Germano Cavalcante (mano-wii) updated this revision to Diff 21436.Feb 6 2020, 3:05 AM
  • Revert "Fix T69776: Error with complex Eevee noise texture in some drivers"
Harbormaster completed remote builds in B6504: Diff 21436.Feb 6 2020, 3:05 AM
Antonio Vazquez (antoniov) added a comment.Feb 6 2020, 10:04 AM

@Philipp Oeser (lichtwerk) @Germano Cavalcante (mano-wii) If this is the right place to make the fix, I can handle this bug.

source/blender/blenloader/intern/readfile.c
11873

need too: GP_DATA_STROKE_PAINTMODE GP_DATA_STROKE_SCULPTMODE GP_DATA_STROKE_WEIGHTMODE

Antonio Vazquez (antoniov) added a comment.Feb 6 2020, 10:08 AM
if (ob->type == OB_GPENCIL) {
      bGPdata *gpd = (bGPdata *)ob->data;
      gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
      gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
      gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
      gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
    }
Philipp Oeser (lichtwerk) updated this revision to Diff 21451.Feb 6 2020, 10:32 AM

also clear other flags (thx @Antonio Vazquez (antoniov) for the heads up)

Harbormaster completed remote builds in B6507: Diff 21451.Feb 6 2020, 10:32 AM
Philipp Oeser (lichtwerk) added projects: Grease Pencil, Datablocks and Libraries.Feb 6 2020, 10:34 AM

@Antonio Vazquez (antoniov) : updated with the other flags.
regarding the best place to do this: I think @Bastien Montagne (mont29) would know best...

Bastien Montagne (mont29) requested changes to this revision.EditedFeb 6 2020, 11:10 AM

Not exactly thrilled to have that here, and to be looping over objects for some specific obdata thing...

Can't you simply do that in direct_link_gpencil(), behind an if (gpd->id.lib != NULL)?

This revision now requires changes to proceed.Feb 6 2020, 11:10 AM
Antonio Vazquez (antoniov) commandeered this revision.Feb 6 2020, 11:16 AM
Antonio Vazquez (antoniov) edited reviewers, added: Philipp Oeser (lichtwerk); removed: Antonio Vazquez (antoniov).
Antonio Vazquez (antoniov) updated this revision to Diff 21452.Feb 6 2020, 11:19 AM

Updating D6759: Fix T64058: Grease Pencil Object saved in editmode is not appended in objectmode correctly

Harbormaster completed remote builds in B6508: Diff 21452.Feb 6 2020, 11:19 AM
This revision was not accepted when it landed; it landed in state Needs Review.Feb 6 2020, 11:31 AM
Closed by commit rB342ceba5bf6e: Fix T64058: GPencil - Ensure object mode if linking from a library (authored by Antonio Vazquez (antoniov)). · Explain Why
This revision was automatically updated to reflect the committed changes.
Antonio Vazquez (antoniov) added a commit: rB342ceba5bf6e: Fix T64058: GPencil - Ensure object mode if linking from a library.
Philipp Oeser (lichtwerk) added a comment.Feb 6 2020, 11:32 AM

@Bastien Montagne (mont29): that if (gpd->id.lib != NULL) was the one I was looking for, thx!
@Antonio Vazquez (antoniov): talked about the comment (add "If linking from a library"), other than that, go ahead

Bastien Montagne (mont29) added a comment.Feb 6 2020, 11:33 AM

LGTM now.

source/blender/blenloader/intern/readfile.c
7230

Ensure full objectmode for linked grease pencil.

Revision Contents
Changeset List

PathSize
source/
blender/
blenloader/
intern/
8 lines

Diff 21454

View Options

source/blender/blenloader/intern/readfile.c

Loading...