Commit: cf5b7f97de8bbe487933ad62dbc632da58ac982e
Author: Antonioya
Date: Fri Mar 15 10:10:27 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBcf5b7f97de8bbe487933ad62dbc632da58ac982e
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_edit.c
index a6feb6477a3,1388beb0b20..7064f54be98
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -3360,8 -3363,9 +3363,9 @@@ static int gp_strokes_reproject_exec(bC
}
}
- ED_gp_project_point_to_plane(scene, ob,
rv3d, origin,
- axis, &pt2);
+ ED_gp_project_point_to_plane(
- ob, rv3d, origin,
- axis, &pt2);
++ scene, ob, rv3d, origin,
++ axis, &pt2);
copy_v3_v3(&pt->x, &pt2.x);
diff --cc source/blender/editors/gpencil/gpencil_primitive.c
index e57b66839ef,88906488e1a..fcba1ae7030
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@@ -924,12 -925,12 +925,13 @@@ static void gp_primitive_update_strokes
/* get origin to reproject point */
float origin[3];
- ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob,
tgpi->gpl,
- ts->gpencil_v3d_align, origin);
+ ED_gp_get_drawing_reference(
+ tgpi->scene, tgpi->ob, tgpi->gpl,
+ ts->gpencil_v3d_align, origin);
/* reproject current */
ED_gpencil_tpoint_to_point(tgpi->ar, origin, tpt, &spt);
- ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d,
origin, tgpi->lock_axis - 1, &spt);
+ ED_gp_project_point_to_plane(tgpi->scene, tgpi->ob,
tgpi->rv3d,
+
origin, tgpi->lock_axis - 1, &spt);
/* reproject previous */
ED_gpencil_tpoint_to_point(tgpi->ar, origin, tptb,
&spt2);
@@@ -989,11 -989,11 +991,12 @@@
/* reproject to plane */
if (!is_depth) {
float origin[3];
- ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob, tgpi->gpl,
- ts->gpencil_v3d_align, origin);
+ ED_gp_get_drawing_reference(
+ tgpi->scene, tgpi->ob, tgpi->gpl,
+ ts->gpencil_v3d_align, origin);
ED_gp_project_stroke_to_plane(
- tgpi->ob, tgpi->rv3d, gps, origin,
ts->gp_sculpt.lock_axis - 1);
+ tgpi->scene, tgpi->ob, tgpi->rv3d, gps,
+ origin, ts->gp_sculpt.lock_axis - 1);
}
/* if parented change position relative to parent object */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
