[Bf-blender-cvs] [ee672ad4ea1] greasepencil-object: Merge branch 'master' into greasepencil-object
Antonioya
noreply at git.blender.org
Tue Jan 8 09:28:23 CET 2019
Commit: ee672ad4ea15f902876f09046126390f1c45a581
Author: Antonioya
Date: Tue Jan 8 09:28:08 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBee672ad4ea15f902876f09046126390f1c45a581
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/editors/gpencil/gpencil_paint.c
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index fb2f1b529d2,6543a65f67f..1b75f3be117
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -128,76 -128,108 +128,117 @@@ typedef enum eGPencil_PaintFlags
typedef struct tGPsdata {
bContext *C;
- Main *bmain; /* main database pointer */
- Scene *scene; /* current scene from context */
+ /** main database pointer. */
+ Main *bmain;
+ /** current scene from context. */
+ Scene *scene;
struct Depsgraph *depsgraph;
- Object *ob; /* current object */
- wmWindow *win; /* window where painting originated */
- ScrArea *sa; /* area where painting originated */
- ARegion *ar; /* region where painting originated */
- View2D *v2d; /* needed for GP_STROKE_2DSPACE */
- rctf *subrect; /* for using the camera rect within the 3d view */
+ /** current object. */
+ Object *ob;
+ /** window where painting originated. */
+ wmWindow *win;
+ /** area where painting originated. */
+ ScrArea *sa;
+ /** region where painting originated. */
+ ARegion *ar;
+ /** needed for GP_STROKE_2DSPACE. */
+ View2D *v2d;
+ /** for using the camera rect within the 3d view. */
+ rctf *subrect;
rctf subrect_data;
- GP_SpaceConversion gsc; /* settings to pass to gp_points_to_xy() */
+ /** settings to pass to gp_points_to_xy(). */
+ GP_SpaceConversion gsc;
- PointerRNA ownerPtr; /* pointer to owner of gp-datablock */
- bGPdata *gpd; /* gp-datablock layer comes from */
- bGPDlayer *gpl; /* layer we're working on */
- bGPDframe *gpf; /* frame we're working on */
-
- char *align_flag; /* projection-mode flags (toolsettings - eGPencil_Placement_Flags) */
-
- eGPencil_PaintStatus status; /* current status of painting */
- eGPencil_PaintModes paintmode; /* mode for painting */
- eGPencil_PaintFlags flags; /* flags that can get set during runtime (eGPencil_PaintFlags) */
-
- short radius; /* radius of influence for eraser */
-
- float mval[2]; /* current mouse-position */
- float mvalo[2]; /* previous recorded mouse-position */
- float mvali[2]; /* initial recorded mouse-position */
-
- float pressure; /* current stylus pressure */
- float opressure; /* previous stylus pressure */
+ /** pointer to owner of gp-datablock. */
+ PointerRNA ownerPtr;
+ /** gp-datablock layer comes from. */
+ bGPdata *gpd;
+ /** layer we're working on. */
+ bGPDlayer *gpl;
+ /** frame we're working on. */
+ bGPDframe *gpf;
+
+ /** projection-mode flags (toolsettings - eGPencil_Placement_Flags) */
+ char *align_flag;
+
+ /** current status of painting. */
+ eGPencil_PaintStatus status;
+ /** mode for painting. */
+ eGPencil_PaintModes paintmode;
+ /** flags that can get set during runtime (eGPencil_PaintFlags) */
+ eGPencil_PaintFlags flags;
+
+ /** radius of influence for eraser. */
+ short radius;
+
+ /** current mouse-position. */
+ float mval[2];
+ /** previous recorded mouse-position. */
+ float mvalo[2];
++ /** initial recorded mouse-position */
++ float mvali[2];
+
+ /** current stylus pressure. */
+ float pressure;
+ /** previous stylus pressure. */
+ float opressure;
/* These need to be doubles, as (at least under unix) they are in seconds since epoch,
* float (and its 7 digits precision) is definitively not enough here!
* double, with its 15 digits precision, ensures us millisecond precision for a few centuries at least.
*/
- double inittime; /* Used when converting to path */
- double curtime; /* Used when converting to path */
- double ocurtime; /* Used when converting to path */
-
- float imat[4][4]; /* inverted transformation matrix applying when converting coords from screen-space
- * to region space */
+ /** Used when converting to path. */
+ double inittime;
+ /** Used when converting to path. */
+ double curtime;
+ /** Used when converting to path. */
+ double ocurtime;
+
+ /** Inverted transformation matrix applying when converting coords from screen-space
+ * to region space. */
+ float imat[4][4];
float mat[4][4];
- float custom_color[4]; /* custom color - hack for enforcing a particular color for track/mask editing */
+ /** custom color - hack for enforcing a particular color for track/mask editing. */
+ float custom_color[4];
- void *erasercursor; /* radial cursor data for drawing eraser */
+ /** radial cursor data for drawing eraser. */
+ void *erasercursor;
/* mat settings are only used for 3D view */
- Material *material; /* current material */
- Brush *brush; /* current drawing brush */
- Brush *eraser; /* default eraser brush */
-
- short straight; /* 1: line horizontal, 2: line vertical, other: not defined */
- int lock_axis; /* lock drawing to one axis */
- bool disable_fill; /* the stroke is no fill mode */
- /** current material. */
++ /** current material */
+ Material *material;
-
- /** current drawing brush. */
++ /** current drawing brush */
+ Brush *brush;
- /** default eraser brush. */
++ /** default eraser brush */
+ Brush *eraser;
- /** 1: line horizontal, 2: line vertical, other: not defined, second element position. */
- short straight[2];
- /** lock drawing to one axis. */
++
++ /** 1: line horizontal, 2: line vertical, other: not defined */
++ short straight;
++ /** lock drawing to one axis */
+ int lock_axis;
- /** the stroke is no fill mode. */
++ /** the stroke is no fill mode */
+ bool disable_fill;
RNG *rng;
- short keymodifier; /* key used for invoking the operator */
- short shift; /* shift modifier flag */
- float totpixlen; /* size in pixels for uv calculation */
- /** key used for invoking the operator. */
++ /** key used for invoking the operator */
+ short keymodifier;
- /** shift modifier flag. */
++ /** shift modifier flag */
+ short shift;
-
- /** size in pixels for uv calculation. */
++ /** size in pixels for uv calculation */
+ float totpixlen;
+ /* guide */
- float guide_spacing; /* guide spacing */
- float half_spacing; /* half guide spacing */
- float origin[2]; /* origin */
++ /** guide spacing */
++ float guide_spacing;
++ /** half guide spacing */
++ float half_spacing;
++ /** origin */
++ float origin[2];
+
ReportList *reports;
} tGPsdata;
@@@ -3277,8 -3023,8 +3325,9 @@@ static int gpencil_draw_modal(bContext
{
tGPsdata *p = op->customdata;
ToolSettings *ts = CTX_data_tool_settings(C);
+ GP_Sculpt_Guide *guide = &p->scene->toolsettings->gp_sculpt.guide;
- int estate = OPERATOR_PASS_THROUGH; /* default exit state - pass through to support MMB view nav, etc. */
+ /* default exit state - pass through to support MMB view nav, etc. */
+ int estate = OPERATOR_PASS_THROUGH;
/* if (event->type == NDOF_MOTION)
* return OPERATOR_PASS_THROUGH;
More information about the Bf-blender-cvs
mailing list