Commit: 16f11d28ae57b3951096af4f150362e25681a535
Author: YimingWu
Date: Fri Aug 9 08:40:37 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB16f11d28ae57b3951096af4f150362e25681a535
Merge remote-tracking branch 'origin/master' into soc-2019-npr
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_gpencil.h
index 60d7ba3cb60,997f1fc82e1..c544c065a70
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -294,16 -216,7 +298,16 @@@ float BKE_gpencil_stroke_length(const s
void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]);
- bool BKE_gpencil_sample_stroke(struct bGPDstroke *gps, const float dist);
+ bool BKE_gpencil_sample_stroke(struct bGPDstroke *gps, const float dist,
const bool select);
+bool BKE_gpencil_stretch_stroke(struct bGPDstroke *gps, const float dist);
+bool BKE_gpencil_trim_stroke_points(struct bGPDstroke *gps,
+ const int index_from,
+ const int index_to);
+bool BKE_gpencil_shrink_stroke(struct bGPDstroke *gps, const float dist);
+bool BKE_gpencil_split_stroke(struct bGPDframe *gpf,
+ struct bGPDstroke *gps,
+ const int before_index,
+ struct bGPDstroke **remaining_gps);
bool BKE_gpencil_smooth_stroke(struct bGPDstroke *gps, int i, float inf);
bool BKE_gpencil_smooth_stroke_strength(struct bGPDstroke *gps, int
point_index, float influence);
bool BKE_gpencil_smooth_stroke_thickness(struct bGPDstroke *gps, int
point_index, float influence);
diff --cc source/blender/editors/mesh/editmesh_tools.c
index f40d041294a,8af0760c841..8d15d956e5c
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -7577,9 -7576,11 +7577,11 @@@ void MESH_OT_mark_lanpr_face(wmOperator
/** \} */
-#endif /* WITH_FREESTYLE */
+//#endif /* WITH_FREESTYLE */
- /********************** Loop normals editing tools modal map.
**********************/
+ /* -------------------------------------------------------------------- */
+ /** \name Loop Normals Editing Tools Modal Map
+ * \{ */
/* NOTE: these defines are saved in keymap files, do not change values but
just add new ones */
/* NOTE: We could add more here, like e.g. a switch between local or global
coordinates of target,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
