[Bf-blender-cvs] [bf8259dfb47] tmp-transform-navigate: Do not support for To Sphere (It does not display mouse cursor)
Germano Cavalcante
noreply at git.blender.org
Wed Mar 2 20:54:12 CET 2022
Commit: bf8259dfb47501ff85a9a6eb836be89f6dc823a0
Author: Germano Cavalcante
Date: Wed Mar 2 16:49:47 2022 -0300
Branches: tmp-transform-navigate
https://developer.blender.org/rBbf8259dfb47501ff85a9a6eb836be89f6dc823a0
Do not support for To Sphere (It does not display mouse cursor)
===================================================================
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_ops.c
===================================================================
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index d06afda3d6a..bd373e104f2 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -664,8 +664,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
t->flag |= T_NO_CURSOR_WRAP;
}
- if (op && t->flag & T_MODAL) {
- t->vod = ED_view3d_navigation_init(C);
+ if (op && (t->flag & T_MODAL) && !(t->flag & T_RELEASE_CONFIRM)) {
+ /* To Sphere mode does not display mouse cursor. This is problematic for navigation. */
+ if (t->mode != TFM_TOSPHERE) {
+ t->vod = ED_view3d_navigation_init(C);
+ }
}
setTransformViewMatrices(t);
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index c0436d3cc40..4d01cf7fe39 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -421,7 +421,7 @@ static int transform_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
/* Allow navigation while transforming */
- if (!(t->flag & T_RELEASE_CONFIRM) && ED_view3d_navigation_do(C, t->vod, event)) {
+ if (t->vod && ED_view3d_navigation_do(C, t->vod, event)) {
RegionView3D *rv3d = t->region->regiondata;
if (event->type == EVT_MODAL_MAP) {
/* Pass. These events can cancel modifiers. */
More information about the Bf-blender-cvs
mailing list