diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:52:48 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:54:53 +0300 |
| commit | 2db84a8ee7cd3873e11eb0c13abc09869caa0042 (patch) | |
| tree | ea15209cc9742e23f36a7e692eb837723bfa64b3 /source/blender/editors/include/ED_transform.h | |
| parent | a41ee7ea1ae9bb1bcc537576d9ffdb3bca3201f3 (diff) | |
Fix all merge conflicts
There was a lot of conflicts and to solve, I refresh manually the source folders.
Diffstat (limited to 'source/blender/editors/include/ED_transform.h')
| -rw-r--r-- | source/blender/editors/include/ED_transform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 82cc518f029..d7fb108809f 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -94,7 +94,8 @@ bool BIF_createTransformOrientation(struct bContext *C, bool overwrite); void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *target); -void ED_getTransformOrientationMatrix(struct ViewLayer *view_layer, +void ED_getTransformOrientationMatrix(const struct Scene *scene, + struct ViewLayer *view_layer, const struct View3D *v3d, struct Object *ob, struct Object *obedit, |