Commit: 35a6172ddcab14210bd990b7fead1ced32836014
Author: Antonio Vazquez
Date: Tue Jul 21 15:54:19 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB35a6172ddcab14210bd990b7fead1ced32836014
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenkernel/BKE_gpencil_geom.h
source/blender/blenkernel/intern/gpencil_geom.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_gpencil_geom.h
index 5efcd1ef8c8,1b22931483c..0c0ef452aed
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@@ -84,10 -78,21 +84,24 @@@ void BKE_gpencil_stroke_uv_update(struc
void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]);
+ typedef struct GPencilPointCoordinates {
+ /* This is used when doing "move only origin" in object_data_transform.c.
+ * pressure is needs to be stored here as it is tied to object scale. */
+ float co[3];
+ float pressure;
+ } GPencilPointCoordinates;
+
+ int BKE_gpencil_stroke_point_count(struct bGPdata *gpd);
+ void BKE_gpencil_point_coords_get(struct bGPdata *gpd,
GPencilPointCoordinates *elem_data);
+ void BKE_gpencil_point_coords_apply(struct bGPdata *gpd, const
GPencilPointCoordinates *elem_data);
+ void BKE_gpencil_point_coords_apply_with_mat4(struct bGPdata *gpd,
+ const GPencilPointCoordinates
*elem_data,
+ const float mat[4][4]);
+
-bool BKE_gpencil_stroke_sample(struct bGPDstroke *gps, const float dist,
const bool select);
+bool BKE_gpencil_stroke_sample(struct bGPdata *gpd,
+ struct bGPDstroke *gps,
+ const float dist,
+ const bool select);
bool BKE_gpencil_stroke_smooth(struct bGPDstroke *gps, int i, float inf);
bool BKE_gpencil_stroke_smooth_strength(struct bGPDstroke *gps, int
point_index, float influence);
bool BKE_gpencil_stroke_smooth_thickness(struct bGPDstroke *gps, int
point_index, float influence);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
