Commit Graph

231 Commits

Author SHA1 Message Date
Sergey Sharybin
08c4aaa01b Camera tracking integration
===========================

Initial integration of proxies into movie clip editor.

Known issue: marker preview area uses proxyed image,
             hopefully fix would be available soon.
2011-08-08 12:18:32 +00:00
Sergey Sharybin
33e829819e Camera tracking integration
===========================

Commiting VSE-proxies patch from Peter Schlaile.

Description is here: http://lists.blender.org/pipermail/bf-committers/2011-May/032152.html
Git commit hash: baaecf244b83c70cb57e1bf6fdd51dd8591bde5b
2011-08-08 12:18:20 +00:00
Sergey Sharybin
14e7aa25de Merging r39173 through r39178 from trunk into soc-2011-tomato 2011-08-08 12:11:40 +00:00
Campbell Barton
64a298645f report error on installign keymaps rather then raising an exception. 2011-08-08 09:09:44 +00:00
Campbell Barton
24acf58fc4 quiet harmless py resource warning - file opened but not closed. 2011-08-08 09:01:09 +00:00
Sergey Sharybin
b49d6a6f60 Merging r39135 through r39172 from trunk into soc-2011-tomato 2011-08-08 07:14:59 +00:00
Campbell Barton
22d2764d50 use static sets rather then tuples, python optimizes this case.
minor change to lightmap unpack collecting unique meshes.
2011-08-08 05:21:37 +00:00
Sergey Sharybin
0bb5f21655 Merging r39102 through r39120 from trunk into soc-2011-tomato 2011-08-07 08:56:13 +00:00
Campbell Barton
38280ba38e fix [#28172] Cannot restore Add-ons tab in user preferences after a failed attempt to install an add-on.
non utf8 addons would make the addon UI vanish, now give a message in the console and UI.
2011-08-07 04:55:58 +00:00
Sergey Sharybin
462670b845 Merging r39050 through r39101 from trunk into soc-2011-tomato 2011-08-06 14:52:45 +00:00
Brecht Van Lommel
e6e4c7ef8b KEYMAP REFACTORING
Diff Keymaps

User edited keymaps now no longer override the builtin keymaps entirely, but
rather save only the difference and reapply those changes. This means they can
stay better in sync when the builtin keymaps change. The diff/patch algorithm
is not perfect, but better for the common case where only a few items are changed
rather than entire keymaps The main weakness is that if a builtin keymap item
changes, user modification of that item may need to be redone in some cases.

Keymap Editor

The most noticeable change here is that there is no longer an "Edit" button for
keymaps, all are editable immediately, but a "Restore" buttons shows for keymaps
and items that have been edited. Shortcuts for addons can also be edited in the
keymap editor. 

Addons

Addons now should only modify the new addon keyconfiguration, the keymap items
there will be added to the builtin ones for handling events, and not get lost
when starting new files. Example code of register/unregister:

km = wm.keyconfigs.addon.keymaps.new("3D View", space_type="VIEW_3D")
km.keymap_items.new('my.operator', 'ESC', 'PRESS')

km = wm.keyconfigs.addon.keymaps["3D View"]
km.keymap_items.remove(km.keymap_items["my.operator"])

Compatibility

The changes made are not forward compatible, i.e. if you save user preferences
with newer versions, older versions will not have key configuration changes that
were made.
2011-08-05 20:45:26 +00:00
Campbell Barton
db319f8544 move the ndof menu into the userpref's since it adjusts preferences, also renamed VIEW3D_MT_ndof_settings -> USERPREF_MT_ndof_settings since it has no view3d specific settings. 2011-08-05 14:53:13 +00:00
Sergey Sharybin
2187d7e166 Camera tracking integration
===========================

Added back Scale factor for scene orientation in toolshelf.
But now it's used in a bit other way -- invoke function
checks if operator's property is set and if not -- value
set in toolshelf is used.
2011-08-05 11:43:09 +00:00
Campbell Barton
ad7ea2f892 get a tad more vertical space in the toolbar. 2011-08-05 09:04:11 +00:00
Sergey Sharybin
ec5a7d6206 Merging r38993 through r39028 from trunk into sox-2011-tomato 2011-08-04 16:52:26 +00:00
Sergey Sharybin
1e7203ce07 Camera tracking integration
===========================

- Added function to calculate per-track average error.
  Made this in libmv c-api, probably should be ported
  to libmv pipeline.
- MovieTrackingTrack now holds average reprojection error
  which is displayed in Active Track panel and information
  text in clip editor (if displaying of names are enabled).
- Make "Clean Tracks" take average error on account.
2011-08-04 15:40:28 +00:00
Sergey Sharybin
6cc4952ca3 Camera tracking integration
===========================

- Fixed bug with resetting marker's flag for non-transforming
  tracks when canceling transformation.
- Fixed bug with keyframing non-selected tracks when initializing
  tracking tools.
- Changed selection policy: now invisible parts of marker
  can be selected.
- Added operator redo panel to Clip Editor.
- Set Scale operator now uses operator property for scale.
- Added operator "Clean Tracks" which currently checks if tracks
  are tracked long enough and can select bad tracks, delete them
  or delete tracking segments which are too short.
2011-08-04 14:39:37 +00:00
Kent Mein
79c87852d2 Add .py extension if it is missing from keymap file.
This is for bug #28141
While not really a bug, it makes it a lot easyer to use if it 
has the exension.  (Isn't hidden from the user when they try to load it...)

Kent
2011-08-03 17:58:06 +00:00
Sergey Sharybin
3129072522 Merging r38951 through r38987 from trunk into soc-2011-tomato 2011-08-03 14:02:08 +00:00
Thomas Dinges
4fc56e39bd Patch by oenvoyage - olivier amrein, thanks a lot!
* Material Diffuse Ramp was not greyed out when shadeless was enabled.
2011-08-02 18:56:03 +00:00
Sergey Sharybin
cf6c261cc8 Camera tracking integration
===========================

- Fixed some silly things ni DNA design. Now all
  reconstruction data is stored in Tracking->Reconstruction.
  Please, re-solve your cameras -- reconstruction data
  wouldn't be read from files saved in blender below this
  commit.
- RNA accessors for reconstruction data.
- Store average reconstruction error in new reconstruction
  structure and show it in clip editor header after
  reconstruction.
- Highlight failed to reconstruct frames with red in cache line.
- Added "group" "Failed Tracks" in Select Grouped operator,
  Meant to be used for selecting tracks bundles from which
  failed to to be solved.
- Hotkey to delete marker: Shift-X.
- Jump to next/prev failed frame operator. Hotkeys are
  Ctrl-Shift-Left/Right Arrow.
2011-08-02 18:25:18 +00:00
Sergey Sharybin
1694e5978a Merging r38898 through r38940 from trunk into soc-2011-tomato 2011-08-02 17:32:19 +00:00
Campbell Barton
08426ec2e7 fix [#28148] User Preferences Scripts Path not working 2011-08-02 10:21:25 +00:00
Campbell Barton
70b4758ff8 Made wmNDOFMotionData use a vector rather then xyz members, makes it nicer to use with math functions.
ndof_to_angle_axis and ndof_to_quat now use math functions.
2011-08-02 07:08:22 +00:00
Sergey Sharybin
b5716beef0 Camera tracking integration
===========================

- Do not show frame boundary border when stabilization isn't enabled.
- Separate stabilization settings from display in clip editor.
  Now clip can contain stabilization data but still be displayed
  un-stabilized in clip editor.
- Internal changes in stabilization:
  * Use separated location/scale parameters rather than 4x4 matrix.
    In some ares "decomposed" data is needed (text draw functions, i.e.).
    Also such decomposed data could be used in compositor.
  * MovieClip now uses own structure for cache where additional data
    can be stored. MovieCache structure now one of properties in
    this new structure.
  * Get rid of stable image buffer stored in MovieClipStabilization
    structure. Pre-created buffer for scaling still stored there.
    This helps to keep playback realtime -- re-creating this buffer
    introduces ~15% slowdown.
- Added sliders to 2D stabilization panel which controls intensity
  of translation/scale which applies on shot.
- Added filter type to Stabilize2D compositor node. Supports nearest,
  bilinear and bicubic interpolation.
- After discussion with Sebastian and Francois added new node called
  Transformation. It can apply translation, rotation and scale. It's
  not the same thing as applying this components separately -- all
  transformation is happening inside "canvas". And it should be more
  accurate on interpolation and sub-pixel translation.
  Need to check order of applying translation/scale/rotation btw.
- Added output sockets to movie clip compositor node. They holds
  stabilization data which can be used by Translate or Transform
  nodes.
- Minor fix of UI issues in Display panel.
2011-08-01 15:28:19 +00:00
Sergey Sharybin
6745e45c48 Camera tracking integration
===========================

Implemented 2D stabilization:

- Based on average point of several tracks.
- Tracks for stabilization are controllable from
  "2D stabilization" panel.
- Implemented autoscaling. Could fail if average point is
  too close to frame boundary.
- Background clip in 3D viewport and MovieClip input
  compositor nodes are using stable shot.

Some internal weak things:
- Stable shots aren't cached in moviecache. There is
  only one "slot" for stable shot inside stabilization
  structure.
- This could fail if several threads are requested different
  frames (for example when starting playback, pause to make
  Nodes Editor trigger refresh, continue playback).
- Due to it shouldn't crash i decided to implement better
  caching for stable shots a bit later.
2011-07-29 15:25:00 +00:00
Sergey Sharybin
feffc920bb Merging r38780 through r38818 from trunk into soc-2011-tomato 2011-07-29 15:18:14 +00:00
Nathan Letwory
24def76ac8 svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-29 07:58:03 +00:00
Campbell Barton
2658949752 pep8 cleanup, also print message when attempting to run in animation player mode. 2011-07-29 01:24:03 +00:00
Thomas Dinges
336a47cdcf * Code cleanup
A row with alignment for 1 property = useless: ;-)
2011-07-28 18:19:15 +00:00
Sergey Sharybin
2dc826f083 New option for multires modifier: Subdivide UVs
Enabled by default and also enabled for older filesm so
there should be no regressions.

In some cases it's useful to not use subdivided uvs for multires.
2011-07-28 11:16:10 +00:00
Sergey Sharybin
e2566984ed Merging r38733 through r38779 from trunk into soc-2011-tomato 2011-07-28 11:01:38 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Campbell Barton
46cea37266 fix [#28066] Unchecking 'self project' messes up 'Snap to Vertex'
this option is useful for all non-grid snapping modes (when in editmode) so make available in those cases too.
2011-07-27 07:22:31 +00:00
Thomas Dinges
9a250bea61 Fix part of [#28088] bad button spacing with layout engine for menu items.
* Fixed a cut off text. 
* small cleanup
2011-07-26 20:05:17 +00:00
Sergey Sharybin
f8e1783516 Camera tracking integration
===========================

- Clip Editor now could be an owner for jobs. It was useful
  when i've been attaching Peter's work in my local repo.
- Fixed mouse selection to handle offset correct.
2011-07-26 15:58:29 +00:00
Sergey Sharybin
e92162744b Merging r38704 through r38732 from trunk into soc-2011-tomato 2011-07-26 15:56:53 +00:00
Campbell Barton
71692e802f py api:
- added menu templates
- move template menu into the header of the text editor (so users will find more easily)
- updated mathutils examples, switching the order of multiplication.
2011-07-26 07:39:00 +00:00
Sergey Sharybin
e535c63fdc Camera tracking integration
===========================

- Split clip hotkeys into two categories:
  * Global
  * Editing
  This allows to re-use such hotkeys as track markers
  from properties region without worrying about conflicts.
- Anchor point could now be offseted from marker position.
- Pattern can now be symmetrical relative to marker position only.
- Changes to mouse sliding:
  * Left top rectangle used for marker position and now
    it's half inside and half outside of marker.
  * Right bottom corners are for size.
  * Anchor point can be slided with mouse to adjust offset.
- Resolved conflict caused by left-mouse selection option.
  Now it works perfectly with sliding -- no more "sticky" keys or so.
- Fixed some typos.
2011-07-25 18:11:22 +00:00
Sergey Sharybin
f41d9007c3 Merging r38637 through r38703 from trunk into soc-2011-tomato 2011-07-25 18:05:27 +00:00
Mike Erwin
876e0c2a8b updated ndof popup menu (part 2 of 2) 2011-07-25 00:21:35 +00:00
Sergey Sharybin
64893ee5a3 Camera tracking integration
===========================

- Fixed incorrect mouse sliding when resizing area which isn't
  symmetrical to marker's position.
- Added "Clip" group to User Preferences -> Input lust.
  Now hotkeys can be investigated there and also, they can be changed there.
2011-07-24 12:36:14 +00:00
Thomas Dinges
4ab7c6ae1a 2.5 World Buttons:
* Exposure and Color Range buttons were missing, added them back.
2011-07-24 11:24:30 +00:00
Daniel Salazar
cb2423e849 Add Push/Pull to toolbar 2011-07-24 00:59:03 +00:00
Thomas Dinges
43994ce213 2.5:
* Removed some old not used code.
2011-07-23 22:08:37 +00:00
Sergey Sharybin
75dd7aad75 Merging r38615 through r38636 from trunk into soc-2011-tomato 2011-07-23 18:42:58 +00:00
Thomas Dinges
8cbd88aeef 2.5 UI:
* Added back icon to open the Splash Screen in the info header, next to version string info.
* Removed an unnecessary toggle argument for particle mode select buttons. The Toggle argument is only intended for booleans, not enums.
2011-07-23 15:36:51 +00:00
Sergey Sharybin
22e08353e2 Merging r38562 through r38614 from trunkinto soc-2011-tomato 2011-07-22 16:58:22 +00:00
Sergey Sharybin
478e42970c Camera tracking integration
===========================

- Operator "Join Selected Tracks".
  This operator joins all selected tracks to active track.
  Hotkey is Ctrl-J.
- Operator "Select Grouped".
  Now it's easy to select all locked/keyframes/etc markers.
  Hotkey is Shit-G.
- Operator to jump to beginning/end of active path.
  Hotkeys are Shift+Ctrl+Arrow Left/Right.
- Operator to copy color from active track to all tracks.
2011-07-22 16:18:51 +00:00
Nathan Letwory
7b1bb26135 Show NDOF sensitivity field in userprefs 2011-07-21 22:26:58 +00:00