Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Luc Peurière <jlp@nerim.net>2007-08-17 02:00:29 +0400
committerJean-Luc Peurière <jlp@nerim.net>2007-08-17 02:00:29 +0400
commit7f6bb8d8ccd49b3f14f9799962bfa37d47beef68 (patch)
tree375dc7d215a9d5e70d4b0fe642c857bf1e06261e /source/blender/src
parenta29188aa30822860a6adc220012659d63ca50496 (diff)
sculpt mode ndof transforms.
please test, especially with multires conditions
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/space.c26
-rwxr-xr-xsource/blender/src/transform.c8
2 files changed, 26 insertions, 8 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 6250061f94c..31f458085db 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1476,6 +1476,31 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
do_layer_buttons(11); break;
case ACCENTGRAVEKEY:
do_layer_buttons(-1); break;
+
+ case NDOFMOTION:
+ if (G.vd->ndofmode == 0) {
+ viewmoveNDOF(1);
+ } else if (G.vd->ndofmode == 1) {
+ viewmoveNDOFfly(1);
+ } else {
+ if (OBACT) {
+ ndof_transform();
+ }
+ }
+ break;
+
+ case NDOFBUTTON:
+ if (val == 1) {
+ G.vd->ndofmode +=1;
+ if (G.vd->ndofmode > 2) /* we have currently 3 modes : 0 original, 1 fly, 2 transform */
+ G.vd->ndofmode = 0;
+ }
+ if (val == 2) {
+ G.vd->ndoffilter =(G.vd->ndoffilter == 1 ? 0 : 1);
+ }
+ allqueue(REDRAWHEADERS, 0);
+ break;
+
}
/* Redraw buttons window as well as view 3d (for floating panel) */
@@ -1577,7 +1602,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
ndof_transform();
}
}
-
break;
case NDOFBUTTON:
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index d8bd30796f2..e6ee597db29 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -3184,13 +3184,7 @@ void ndof_do_transform(float *fval)
special_aftertrans_update(&Trans);
}
-
-
-
- if (change) {
- ;
- }
-
+
/* send events out for redraws */
viewRedrawPost(&Trans);