Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / include / ED_transform.h

diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 536f9c22dcdfd078fb8b385879fc31503db58662..e17d02abcd7d16a186138e3692b30e41b2728ac7 100644 (file)
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -130,7 +130,7 @@ void BIF_createTransformOrientation(struct bContext *C, struct ReportList *repor
                                     const char *name, const bool use_view,
                                     const bool activate, const bool overwrite);
 void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
-void BIF_selectTransformOrientationValue(struct View3D *v3d, int orientation);
+void BIF_selectTransformOrientationValue(struct Scene *scene, int orientation);
 
 void ED_getTransformOrientationMatrix(const struct bContext *C, float orientation_mat[3][3], const short around);
 
@@ -194,4 +194,24 @@ bool snapNodesTransform(
         /* return args */
         float r_loc[2], float *r_dist_px, char *r_node_border);
 
+struct TransformBounds {
+       float center[3];                /* Center for transform widget. */
+       float min[3], max[3];   /* Boundbox of selection for transform widget. */
+
+       /* Normalized axis */
+       float axis[3][3];
+       float axis_min[3], axis_max[3];
+};
+
+struct TransformCalcParams {
+       uint use_only_center : 1;
+       uint use_local_axis : 1;
+       /* Use 'Scene.orientation_type' when zero, otherwise subtract one and use. */
+       ushort orientation_type;
+};
+int ED_transform_calc_manipulator_stats(
+        const struct bContext *C,
+        const struct TransformCalcParams *params,
+        struct TransformBounds *tbounds);
+
 #endif  /* __ED_TRANSFORM_H__ */