Commit: f5105fe9f92f3ec0b0f4dde9ca5d4719d1090878 Author: Antonio Vazquez Date: Thu Sep 10 20:14:56 2020 +0200 Branches: greasepencil-object https://developer.blender.org/rBf5105fe9f92f3ec0b0f4dde9ca5d4719d1090878
Merge branch 'master' into greasepencil-object Conflicts: source/blender/blenkernel/intern/gpencil_geom.c =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_gpencil_geom.h index 313eef7942b,404cbbe1741..52e21455125 --- a/source/blender/blenkernel/BKE_gpencil_geom.h +++ b/source/blender/blenkernel/BKE_gpencil_geom.h @@@ -127,27 -124,8 +127,26 @@@ bool BKE_gpencil_convert_mesh(struct Ma const float matrix[4][4], const int frame_offset, const bool use_seams, - const bool use_faces, - const bool simple_material); + const bool use_faces); +void BKE_gpencil_stroke_to_view_space(struct RegionView3D *rv3d, + struct bGPDstroke *gps, + float diff_mat[4][4]); +void BKE_gpencil_stroke_from_view_space(struct RegionView3D *rv3d, + struct bGPDstroke *gps, + float diff_mat[4][4]); +struct bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d, + const struct bGPdata *gpd, + const struct bGPDlayer *gpl, + struct bGPDstroke *gps, + int subdivisions, + float diff_mat[4][4]); +struct bGPDstroke *BKE_gpencil_stroke_perimeter_from_view_2d(struct ARegion *region, + const struct bGPdata *gpd, + const struct bGPDlayer *gpl, + struct bGPDstroke *gps, + int subdivisions, + float diff_mat[4][4]); #ifdef __cplusplus } #endif _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs