Commit Graph

317 Commits

Author SHA1 Message Date
Sergey Sharybin
58f3503e90 Fix #29201: movie clip editor - right click crashes blender
Just another not very smart check for "boundary" case of usecase.
2011-11-08 16:09:20 +00:00
Sergey Sharybin
27d42c63d9 Camera tracking integration
===========================

Commiting camera tracking integration gsoc project into trunk.

This commit includes:

- Bundled version of libmv library (with some changes against official repo,
  re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
  clips (both of movie files and image sequences) and doing camera/motion
  tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
  stuff only, but which can be easily extended to work with masks too.

  This editor supports:
  * Loading movie files/image sequences
  * Build proxies with different size for loaded movie clip, also supports
    building undistorted proxies to increase speed of playback in
    undistorted mode.
  * Manual lens distortion mode calibration using grid and grease pencil
  * Supervised 2D tracking using two different algorithms KLT and SAD.
  * Basic algorithm for feature detection
  * Camera motion solving. scene orientation

- New constraints to "link" scene objects with solved motions from clip:

  * Follow Track (make object follow 2D motion of track with given name
    or parent object to reconstructed 3D position of track)
  * Camera Solver to make camera moving in the same way as reconstructed camera

This commit NOT includes changes from tomato branch:

- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
  (need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
  readability and understanadability of code. Better to make this chaneg when
  Keir will finish his current patch.

More details about this project can be found on this page:
    http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011

Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
2011-11-07 12:55:18 +00:00
Campbell Barton
7c88bc5952 replace macros for bli math functions in editors 2011-11-06 16:34:44 +00:00
Campbell Barton
0d63bb005f replace VECCOPY and QUATCOPY with inline funcs. 2011-10-28 12:40:15 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Campbell Barton
e58eb5db6f use defines for keying set names to avoid confusing them with text and having some incorrect names (as fixed in last commit) 2011-10-23 05:08:02 +00:00
Campbell Barton
6c9362a2ea fix for incorrect keying set names 'Scale' vs 'Scaling', where 'Scale' was hard coded in auto keyframe when 'Only Insert Needed' option was enabled and would always fail to return a keying set.
- to be included in 2.60a.
2011-10-23 04:48:13 +00:00
Joshua Leung
8e58fceab1 Bugfix [#28976] crash when moving keys in dopesheet editor 2011-10-20 05:18:02 +00:00
Campbell Barton
275093324f fix [#28023] VSE: Transform Markers doesn't do anything
- renamed to 'Sync Markers' to match action editor.
- action editor option was broken in the same way as the sequencer.
2011-10-03 02:49:08 +00:00
Campbell Barton
74c681330f fix [#28788] Scale using "Individual origins" in bones
works for rotate and scale
2011-10-02 19:57:34 +00:00
Campbell Barton
ceb81b1960 no-longer select handles when transforming in the dopesheet since now the dope sheet acts as if handles are hidden.
also remove invalid comment.
2011-09-29 06:13:25 +00:00
Campbell Barton
5bbd0decfd fix [#28765] keyframe handles do not move with curves in graph editor when hidden, resulting in bad curves.
hide handles wasn't properly respected by transform function testhandles_fcurve().
2011-09-29 05:03:21 +00:00
Campbell Barton
c8b0d25794 fix [#28158] Image crop keyframes/fcurves do not 'stick' to strip 2011-09-28 10:05:56 +00:00
Campbell Barton
450ea01002 transform sequencer update was checking against the wrong transform mode. 2011-09-28 09:47:30 +00:00
Sergey Sharybin
f0cceedd7a Fix #28747: Crash in Node Editor
Setting of transform flags happened with NULL edittree
2011-09-26 08:51:02 +00:00
Campbell Barton
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Sergey Sharybin
1ca02a8d29 Fix rest of #28693: Proportional edit hangs on mesh object with high scale
Patchy by Juha Maki-Kanto
2011-09-22 15:46:34 +00:00
Campbell Barton
78d4260144 committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking. 2011-09-20 10:15:57 +00:00
Campbell Barton
84d06f252e tag & comment unused vars with /* UNUSED */ 2011-09-20 08:48:48 +00:00
Campbell Barton
d321397930 fix from Juha Mäki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off. 2011-09-20 06:47:43 +00:00
Bastien Montagne
f157a543c6 /blender/editors: Removed final points in UI strings and messages.
Plus a few cuts in very long lines…
2011-09-19 12:26:20 +00:00
Campbell Barton
1741269d30 resolve bad level calls from blenkenel/ into editors/ & remove editors from the include path from CMake & SCons.
* ED_curve_editnurbs --> curve_editnurbs
* ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-14 00:37:27 +00:00
Campbell Barton
4bd0a2ba2d replace VECCOPY -> copy_v3_v3, added copy_v*_v*_short too for typesafe copying, some parts of the code are copying float -> short normals without scaling. fix coming next. 2011-09-12 04:14:12 +00:00
Lukas Toenne
8e0fe8bff7 Merged the particles-2010 branch with node improvements into trunk.
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:

http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
Joshua Leung
dca090abc8 Assorted loose ends for auto-clamped handles work
* Tweaked order of handle types to make it easier to find Auto/Auto-
clamped in the list
* Fixed a number of places which were still just checking for auto-
handles when they should have included auto-clamped too, including
handle rotation
2011-08-05 11:23:28 +00:00
Joerg Mueller
682cc63161 Merging with trunk up to r38631. 2011-07-23 16:34:30 +00:00
Ton Roosendaal
ea90544d65 Need some fun once a while:
On dragging a non-connected node on a noodle, it will insert it.
Functionality tweaks are possible, but it already feels non-intrusive.

Rules:
- Insertion only when a single noodle is intersecting with node.
- Default connects first matching socket type. 
- If no socket match, it connects the first.
2011-07-22 15:28:50 +00:00
Joerg Mueller
d9cf985730 Merging trunk up to r38329. 2011-07-12 13:09:22 +00:00
Brecht Van Lommel
1f6a79ecb5 Fix #27926: autokey not working with auto IK, broke this with an earlier bugfix. 2011-07-10 18:21:40 +00:00
Brecht Van Lommel
aa7b843b1c Fix #27902: autokey bones with individual origins transform not working. 2011-07-08 11:43:35 +00:00
Joshua Leung
82b17039ed NLA Drawing - When "Show Control Curves" option in View menu is
disabled, the strips are drawn so that they take up less vertical
space.

Originally, the primary reason why these were taller than those in the
other animation editors was really so that these control curves could
be visualised adequately. So, when these aren't shown, we can afford
to collapse the strips vertically.

This should make it possible to fit more strips on screen to retime
them. in some staggered fashion.
2011-07-06 01:34:10 +00:00
Joerg Mueller
3f3c6f5f1f Merging from trunk up to r38119. 2011-07-05 13:54:25 +00:00
Joshua Leung
a0fa8c3cd2 Bugfix #27856: Transforming Grease Pencil frames in Action Editor
didn't perform updates

* This problem was caused by a typo when adapting old code
* Fixed crash where keyframes-update was being called in Grease Pencil
transforms too

Todo:
Outliner/Datablocks Viewer doesn't update that nicely when these
keyframes get modified. Outside of gdb, I managed to get a few non-
repeatable crashes here; while debugging though, there was only some
lagging oddness if panning before the tree updated.
2011-07-05 01:54:01 +00:00
Ton Roosendaal
d40b9e2e1c As per discussion: allow bone transforms again for proxy'ed bones. 2011-07-03 18:21:37 +00:00
Joshua Leung
ab2026bf42 Animation Channel Filtering Refactor - Part 3 (Visibility Flag Split)
* This (big) commit is aimed at cleaning up the filtering flags used
by the animation channel filtering code. The list of filtering flags
has been growing a bit "organically" since it's humble origins for use
in the Action Editor some 3 years (IIRC) ago now during a weekend
hackathon. Obviously, some things have ended up tacked on, while
others have been the product of other flag options. Nevertheless, it
was time for a bit of a spring clean!

* Most notably, one area where the system outgrown its original design
for the Action Editor was in terms of the "visibility" filtering flag
it was using. While in the Action Editor the concept of what channels
to include was strictly dictated by whether the channel hierarchy
showed it, in the Graph Editor this is not always the case. In other
words, there was a difference between the data the channels
represented being visible and the channels for that data being visible
in the hierarchy.

Long story short: this lead to bug report [#27076] (and many like it),
where if you selected an F-Curve, then collapsed the Group it was in,
then even after selecting another F-Curve in another Group, the
original F-Curve's properties would still be shown in the Properties
Region. The good news is that this commit fixes this issue right away!

* More good news will follow, as I start checking on the flag usage of
other tools, but I'm committing this first so that we have a stable
reference (of code similar to the old buggy stuff) on which we can
fall back to later to find bugs (should they pop up).

Anyways, back to the trenches!
2011-06-22 11:41:26 +00:00
Joerg Mueller
207911bdb3 Merge with trunk r37677 2011-06-20 22:55:18 +00:00
Campbell Barton
216ba20942 fix [#27671] Transforming sequencer effects strips crashes 2011-06-16 12:48:25 +00:00
Brecht Van Lommel
aaf7dae5f1 Code cleanup: remove unused shaded draw mode code. 2011-06-15 10:17:06 +00:00
Joerg Mueller
8ff0c2e107 Merge with trunk r37475. 2011-06-14 12:06:21 +00:00
Campbell Barton
299602b360 fix for vertex group copy to selected
- was using un-initialized stack memory if the source / target object had no vertex group.
- if the target object had no vertex groups it would fails silently (not a bug but not very good functionality)
- added an error message if any copying fails.
2011-06-07 18:04:03 +00:00
Campbell Barton
d16c1f3665 fix for sequencer transform with effects strips where the effects could be moved to invalid times to avoid overlap but would immediately refresh back to overlapping locations after. 2011-06-07 16:47:25 +00:00
Joshua Leung
072d350aab Time-Slide Fix:
Second attempt at fix for only having a single-key selected. In this
case, it just uses the start/end frame as it's min/max
2011-06-02 11:58:13 +00:00
Joshua Leung
b41427c66b Bugfix: "Time Slide" tool broken
Dunno how long this has been broken for (*), but the Time Slide
transform tool in DopeSheet no longer did anything most of the time.
It appeared to be be caused by some blotched indexing code from ages
ago. I've fixed this problem, as well as preventing the case where it
would also give errors when only a single key was selected.

(*) Does anyone actually use this tool? IIRC, this was added during
Orange, though I can't find the commit for this anymore or why it was
added. Probably it might be better to just let it go...
2011-06-02 11:51:38 +00:00
Campbell Barton
f5ec4cf4e9 fix own mistake [#27451] Flip to Top / Flip to Bottom menuitems on right click on header not working
also get rig of more shadowed vars (-Wshadow).
2011-05-23 08:14:29 +00:00
Campbell Barton
d16da799fb change transform to round at 0.5 for fcurves.
this gave noticeable issue when transforming int/fcurve's below zero.
2011-05-20 18:19:29 +00:00
Campbell Barton
304ce06a5a fix remaining crash from [#27035] 3 problems: crash and enum "REGION" not found in ('VERTS') 2011-05-18 09:58:17 +00:00
Campbell Barton
d4e540dff3 comment some unused code. 2011-05-08 10:29:40 +00:00
Campbell Barton
1093f69e50 Style Cleanup
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
2011-05-01 10:14:09 +00:00
Campbell Barton
210ee1ade4 whitespace only, no functional change mixed tabs/spaces --> tabs. 2011-04-21 13:11:51 +00:00
Joshua Leung
bbf82877cf Bugfix [#26792] blender crash when scaling action strip in NLA
Two part bug:
Part 1) NLA Editor menu was calling wrong operator
Part 2) r35829 broke NLA scaling, since it only checked that the
transform mode used was allowed in the Action Editor (probably
confused by Part 1)
2011-04-05 11:04:00 +00:00