Commit Graph

1136 Commits

Author SHA1 Message Date
192a28bb32 rename mask-objects to mask-layers. 2012-05-31 19:12:22 +00:00
ba7606db15 impliment restrict select option. 2012-05-30 12:54:50 +00:00
44806d2c2b fix for mask transform in non proportional mode. 2012-05-30 12:08:08 +00:00
ad00c1210a rename macros for mask point selection - were a bit confusing. 2012-05-30 11:52:44 +00:00
a111662e1a proportional editing for masks 2012-05-30 07:34:25 +00:00
c93bfdd78b proportional editing for mask transform 2012-05-30 07:15:09 +00:00
6bee4c7a8f transform wasnt ignoring hidden maskobjects 2012-05-30 06:42:03 +00:00
d80333c2ad svn merge ^/trunk/blender -r47058:47067 2012-05-27 11:12:29 +00:00
654ef111a7 Fix #31606: pg up/down does not work for changing falloff for proportional editing
Initially issue was caused by non-proportional edge slide patch in rev46927 which
had several wrong things:

- It introduced new events TFM_WHEEL_DOWN_EVT/TFM_WHEEL_UP_EVT which were defined
  as per-bit OR between edge slide and proportional editing modal events, but
  the issue is that modal events are not bit masks and that meant that new events
  were defined as 20|24 and 21|25 which is a bit strange.
- Another this was caused by the fact, that keymap wasn't creating for some specific
  transform modal keymap item -- it used to be tried to create single shortcut for
  two different modal events, which isn't supported by keymaps and resulted by
  artifacts in keymap editor interface (nodal event type was empty for wheel movements).
  That was caused by different events used by modal keymap and defining shortcuts.
- Actual issue which prevented PgUP/PGDOWN to work was mixing using that new events
  for wheel scrolling in switch statements which doesn't do bitmask check.

Solved by separating keymaps used for proportional editing and edge slide -- now
it's mouse Wheel for proportional editing and Alt-Wheel for edge slide. If someone
would want to have single shortcut for this two events it'll imply one of the follofing
things:

- Support poll function for shortcuts, so keymap would definitely know which
  modal event to send to operator.
- Generalize TFM_MODAL_PROPSIZE_{UP, DOWN} and TFM_MODAL_EDGESLIDE_{UP, DOWN} so
  they can share the same shortcut with current design of keymaps.
2012-05-27 10:08:37 +00:00
dd77076f62 svn merge ^/trunk/blender -r47047:47058 2012-05-26 22:31:28 +00:00
54b64cfd61 code cleanup: use const float and define array size 2012-05-26 22:21:56 +00:00
8c89d52614 svn merge ^/trunk/blender -r47003:47047 2012-05-26 14:19:41 +00:00
6b554c5ec4 Fix for last commit, forgot to update Screen.is_animation_playing python property. 2012-05-25 12:56:29 +00:00
b230ebf726 mask slide now auto-keys 2012-05-25 12:48:24 +00:00
ad65b7b86b Animation playback: now all windows are update during playback, rather than
just the active window.
2012-05-25 12:37:11 +00:00
c6e0d24d02 add auto-key for masks 2012-05-25 10:04:10 +00:00
5ed2e0d5bc svn merge ^/trunk/blender -r46979:47003 2012-05-25 09:42:58 +00:00
fda16e7381 remove some float/double conversions 2012-05-24 21:58:12 +00:00
25b677787f svn merge ^/trunk/blender -r46966:46979 2012-05-24 16:37:40 +00:00
da710b3e14 style cleanup: brace placement/newlines 2012-05-24 16:35:45 +00:00
14a56caee6 Merging r46725 through r46963 from trunk into soc-2011-tomato 2012-05-24 09:47:29 +00:00
57b488574a style cleanup: comma placement 2012-05-23 22:45:39 +00:00
c0f59c44f8 edit to last commit, remove pointer to active slide vert, only need to store the index. 2012-05-23 09:55:48 +00:00
88fc573596 non-proportional edge slide patch by XercesBlue
remmoved edge-visibility check from the patch which gives nice functionality but calculates and BVH and throws it away every update.
2012-05-23 09:46:32 +00:00
dab1d8e487 style cleanup 2012-05-22 22:03:41 +00:00
d2a37d464a code cleanup: double promotion warnings 2012-05-22 21:16:59 +00:00
6c67fc83ea Add vertex skin radii scaling as a transform operator.
Add a new transform operator, "Skin Resize", which scales the X and Y
axes of the radius field in MVertSkin. It's bound to CTRL+AKEY.

Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
2012-05-22 15:30:14 +00:00
Lukas Toenne
53b01d9002 A number of new features for the node editor in general and the Frame node in particular.
For an detailed user-level description of new features see the following blogpost:

http://code.blender.org/index.php/2012/05/node-editing-tweaks/

TL;DR:
* Frame node gets more usable bounding-box behavior
* Node resizing has helpful mouse cursor indicators and works on all borders
* Node selection/active colors are themeable independently
* Customizable background colors for nodes (useful for frames visual
distinction).
2012-05-22 14:13:33 +00:00
130e7ab6f4 Move search area form track to marker structure
This allows different markers has different size of search area which
makes it possible to scale search area when doing planar tracking.

Made changes to all related areas such as transformation, tracking,
finally ported marker clamping function, added python bindings for
changed search area and added python API for pattern corners.

TODO: It's still possible to make marker's center go outside of pattern
      corners when translating pattern area or rotating it around median
      point.
2012-05-21 09:19:08 +00:00
3896ad4cbb code cleanup: spelling 2012-05-20 21:23:26 +00:00
2d2d36fe3b code cleanup:
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
ca446f090b Fix aspect ratio correction for translating motion tracking data
Still has got some issues when translating masks.
2012-05-19 16:55:20 +00:00
ed679693c9 style cleanup: whitespace/indentation 2012-05-19 13:55:54 +00:00
af3e348430 code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars. 2012-05-19 13:28:19 +00:00
ec142edaa0 code cleanup: use for loops for mask/spline looping 2012-05-18 14:49:30 +00:00
2870366d72 rename 'mask shape' to mask object, will make adding shape keys less confusing. 2012-05-18 12:51:11 +00:00
f82bb6fb4e fix error with mask translation not quite following the mouse. 2012-05-18 10:02:14 +00:00
a8a22d968c mask: remove aspect arguments which are no longer needed. 2012-05-18 09:36:32 +00:00
2da49c4a8f Rotation support for motion tracking markers
Implemented general transformation tool Rotation for motion tracking data.
Mainly used to rotate pattern of markers.

To achieve most of usability, added configurable pivot point which is in fact
was median point before, but now can be chosen from boundbox center, median point
or individual centers. Individual centers means transformation would be performed
around marker's position, which is useful for rotation and scale.

Also implemented alternative scaling transformation -- hit S, S leads to
scaling of pattern area only.

TODO:
- clamping in some cases isn't working well, but that's easier to be resolved
  after moving search are to marker.
- Update startup.blend so clip editor in Motion Tracking screen would be set to
  Individual Centers by default.
2012-05-18 09:33:50 +00:00
f21cd531d6 mask editor now stores points/handles in 1:1 aspect, makes tool code _much_ more logical/easier. 2012-05-18 08:59:05 +00:00
69b95e1a8a Code cleanup: de-duplicate some transform constraint code.
No functional changes.
2012-05-17 22:52:42 +00:00
db46f9b552 fix a bug and storing a bool as a float 2012-05-17 18:55:34 +00:00
09bb37fe93 svn merge ^/trunk/blender -r46684:46699 2012-05-16 16:41:51 +00:00
bd45c0008c evil mango feature, alt transform sequence strips bumps other strips out of the way 2012-05-16 16:28:33 +00:00
5ff7ede1b5 modal operation for bevel and inset:
This commit adds some first building blocks for the two operators to work modally based on mouse input. To make their function easier, two hotkeys are introduced, Ctrl+B for bevel and I for inset.

TODO:
After discussion with Campbell, we would like to add scale-style line indicators for the operators. This is already done for transform operators but a new interface for mesh operations may have to be written using pieces from that code since, strictly speaking bevel and inset are not exactly "transform" operators.

Also, a better input method for inset is needed and more options exposed. The method implemented right now uses mouse move for thickness and ctrl-mouse move for depth. These are calculated using the distance of the selection center in screen space and the mouse position. While that may work and prevents abrupt changes in values when switching from thickness tweak mode to depth tweak mode, it limits the magnitude of values that can be put into the tool especially in small or large scale. 

Alternatives until a better method is written include:

* use relative offset (works but may give strange results)
* tweak manually after the operation.
2012-05-16 14:30:41 +00:00
3e4e7bfc42 Tomato: fix usage of uninitialized variables in applyAspectRatio
Thanks Keir for pointing into issue!
2012-05-15 14:44:32 +00:00
4f81bdf73c Start migrating away from pat_min and pat_max for markers
This starts converting markers in the movie clip editor / 2D
tracker from using pat_min and pat_max notation to using the
a more general, 4-corner representation. There is still
considerable porting work to do; in particular:

- The preview widget does not respect the new
  representation
- The corners cannot yet be edited individually.
- The clamping does not do the right thing for general
  corners; e.g. detecting a convex quad.
- The tracking code in Blender does not actually invoke the
  corner tracking version of libmv's tracking API.

Next steps:

- Convert libmv's legacy ESM tracker and brute tracker to
  work under the new TrackRegion() API.
- Make Blender use the new TrackRegion() API; this will
  allow real planar tracking tests.
- Everything else (UI, etc).

This patch is mostly the work of Sergey Sharybin.
2012-05-14 10:47:25 +00:00
2a3fddf5b3 svn merge: Merging r46558 through r46612, from trunk 2012-05-13 18:16:25 +00:00
7444613a9a fix for crash when no mask exists when entering mask transform. 2012-05-13 16:51:17 +00:00
800bc74a8f Adds “align” option to snap to verts/edges/faces, for bones in Pose mode.
Have to use a ugly hack, as for pose bones, rotscale transform matrix is not always the same as translate one... :/

Adresses feature request [#30979] snapping: "align rotation with the snapping target" and pose-mode.
2012-05-13 16:01:59 +00:00