bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Annotations: Make all 2D editors locked to View

Browse Source 
Before, there was a hacky code for Image editor when the image was empty.

Now, all 2D editors are locked to view and when you Move or Zoom, the stroke moves.

This is a fix of T63402.

Still pending if we add more options to 2D editors, but at least now,  we have something consistent.
This commit is contained in:
Antonioya 2019-04-10 17:32:44 +02:00
parent b9e6f9b9c5
commit a3b88c9172
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/gpencil/annotate_paint.c
View File

@ -1423,34 +1423,8 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Deps
break;
}
case SPACE_NODE:
{
p->gpd->runtime.sbuffer_sflag |= GP_STROKE_2DSPACE;
break;
}
case SPACE_SEQ:
{
p->gpd->runtime.sbuffer_sflag |= GP_STROKE_2DSPACE;
break;
}
case SPACE_IMAGE:
{
SpaceImage *sima = (SpaceImage *)p->sa->spacedata.first;
/* only set these flags if the image editor doesn't have an image active,
* otherwise user will be confused by strokes not appearing after they're drawn
*
* Admittedly, this is a bit hacky, but it works much nicer from an ergonomic standpoint!
*/
if (ELEM(NULL, sima, sima->image)) {
/* make strokes be drawn in screen space */
p->gpd->runtime.sbuffer_sflag &= ~GP_STROKE_2DSPACE;
*(p->align_flag) &= ~GP_PROJECT_VIEWSPACE;
}
else {
p->gpd->runtime.sbuffer_sflag |= GP_STROKE_2DSPACE;
}
break;
}
case SPACE_CLIP:
{
p->gpd->runtime.sbuffer_sflag |= GP_STROKE_2DSPACE;