diff options
author | Ton Roosendaal <ton@blender.org> | 2005-03-18 00:31:49 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-03-18 00:31:49 +0300 |
commit | 17bd00a851b24feb19a6a917d39e6e2044f31ccd (patch) | |
tree | 72d4f0e736f06f779fe7538bc8336f1a9b4eae9f /source/blender/render | |
parent | ab21276aaf3de85afeb3b2fc2a265b735712e8d3 (diff) |
So! Finally a show-off of the *power* of Martin P's work! :)
- Made framework for 3d Transform Manipulators (widgets)
- The Manipulators act like '2d buttons', by default with LeftMouse and with
while-hold-move-release
- Implemented now: Translation Widget, which allows:
- four hotspots for axis grab or view-aligned grab
- center defined by 'around' setting
- SHIFT+LMB gives planar constraint on other 2 axes
- works in Object mode and Edit mode (not posemode yet)
Enable it with (temporal) icon in 3D header. All other 'normal' transforms
then keeps working btw.
On the todo for this widget:
- choice for Global, Local or Normal orientation
The way the widgets are going to work is in review still. Commit is also for
Matt for his proposal/paper on topic.
Some notes regarding this project;
- no life updates (on mouse over) like 3DS, I think that's neurotic
- on click, dominant axis changes to theme defined "Transform" color, other axes disappear, like maya
- manipulater size is fixed preset, independent zoom.
- manipulator follows selection, and is located based on 'around' mode
Unresolved;
- in maya, when you select 2 or more objects, the manipulator draws on the 'active' object, also interesting
- what to do with G,R,S hotkeys? It could switch the manipulator "mode"...
- header button/menu for manipulator mode?
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index ffba9ccbea3..06d1930619d 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1624,7 +1624,7 @@ void do_material_tex(ShadeInput *shi) warpvec[2]= mtex->warpfac*texres.nor[2]; warpdone= 1; } - +#if 0 // rotate to global coords if(mtex->texco==TEXCO_ORCO || mtex->texco==TEXCO_UV) { // hrms, for sphere/tube map this rotating doesn't work nice @@ -1639,9 +1639,9 @@ void do_material_tex(ShadeInput *shi) } } } +#endif } - /* mapping */ if(mtex->mapto & (MAP_COL+MAP_COLSPEC+MAP_COLMIR)) { float tcol[3]; |