Commit Graph

1316 Commits

Author SHA1 Message Date
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
24acf58fc4 quiet harmless py resource warning - file opened but not closed. 2011-08-08 09:01:09 +00:00
Campbell Barton
cc0ec3aa33 fix [#28178] make single user copy of object data doesn't work 2011-08-08 08:22:01 +00:00
Sergey Sharybin
b49d6a6f60 Merging r39135 through r39172 from trunk into soc-2011-tomato 2011-08-08 07:14:59 +00:00
Sergey Sharybin
0dea4df764 Changed do_version condition for noodle_curving.
It should be re-set to 5 for files saved in 2.58.1 release.
2011-08-07 14:57:25 +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
117ec4a91a comment unused vars 2011-08-07 04:22:33 +00:00
Campbell Barton
79e359f92a rna/ui: avoid duplicate property gHash lookups by passing the property when its already been found.
added _prop suffix to ui functions which take a prop rather then a propname, may change this later since its not that nice but for gsoc branches this keeps existing UI functions working the same.
2011-08-06 16:00:00 +00:00
Campbell Barton
2f5809d831 make ui_def_but_rna into 2 functions, once which takes a prop, another which takes a propname, no functional change yet but lets us avoid duplicate hash lookups. 2011-08-06 14:57:55 +00:00
Sergey Sharybin
462670b845 Merging r39050 through r39101 from trunk into soc-2011-tomato 2011-08-06 14:52:45 +00:00
Campbell Barton
dc4dede802 for UI text drawing use BLF_ascender(fs->uifont_id) rather then BLF_height(fs->uifont_id, "2"), while profiling draw noticed that the hash lookup on the character and utf8 next were being called on every text draw, use BLF_ascender since it doesn't do any lookups. 2011-08-06 06:38:18 +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
a157112ac5 fix for icon scaling with the DPI setting
- icons were scaling by the sqrt(dpi)/8.48528, but infact they only need to be scaled by (dpi/72).
- UI_icon_get_width value was being used without multiplying by dpi scale.
2011-08-05 10:45:32 +00:00
Sergey Sharybin
ec5a7d6206 Merging r38993 through r39028 from trunk into sox-2011-tomato 2011-08-04 16:52:26 +00:00
Jeroen Bakker
26fe903502 Typo when reading line curving. The subversion is 1, so smaller than 1 should be converted 2011-08-04 12:19:50 +00:00
Jeroen Bakker
9da70f74d3 UserPref/Node editor feature: Change the level of noodle curving.
Some people like curved lines, other hate them. This commit will let the user change the level of curving.

In UserPreferences=>Themes=>Node editor=>Noodle curving the level can be modified. Allowed range is 0-10 with the default on 5

The patch will default everything to the way blender works ATM.
File subversion has been increased otherwise older 258 files got straight lines.

The data is stored in the ThemeSpace.noodle_curving
the bezierdrawing is done in the drawnode. Also tested the Line cut tool
2011-08-04 10:05:14 +00:00
Sergey Sharybin
1694e5978a Merging r38898 through r38940 from trunk into soc-2011-tomato 2011-08-02 17:32:19 +00:00
Nathan Letwory
f1c68bdbec Don't show NDOF guide by default. 2011-08-02 09:12:58 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Sergey Sharybin
e9b3225b8d Merging r38832 through r38897 from trunk into soc-2011-tomato 2011-08-01 15:24:15 +00:00
Guillermo S. Romero
e8c3c4097a SVN maintenance. 2011-07-31 06:03:14 +00:00
Campbell Barton
f66ec41b6a quiet some compiler warnings & fix possible (but unlikely) crash.
also added GPLv2+ header to resources.c.
2011-07-30 09:24:10 +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
b948459031 fix [#28096] Custom gradient for weightpainting in mask mode not working properly. 2011-07-28 12:17:24 +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
Thomas Dinges
955ba3f7fb * Fixed a typo in the code (uiLayoutItemSplt -> uiLayoutItemSplit) 2011-07-26 20:22:54 +00:00
Campbell Barton
a460299b08 - bugfix for icon listview where the icons would only wrap once
- also quiet some clang warnings
2011-07-26 19:47:56 +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
06ae122f60 include menu ID's in tooltips when python tips are enabled, there was no way to find the ID of a menu which become annoying if you wanted to reference it from a script. 2011-07-26 09:19:51 +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
e31fef1d94 set default values for all other ndof flags 2011-07-25 00:10:42 +00:00
Thomas Dinges
b401d09d8f * Minor code cleanup / comment changing. No functional changes. 2011-07-24 11:11:23 +00:00
Nathan Letwory
6149526aac Default for ndof_sensitivity to 1.0 in case 0.0 is found on start. 2011-07-24 08:50:09 +00:00
Sergey Sharybin
fa283be400 Camera tracking integration
===========================

- Fixed bug with copying colors to all selected markers.
- Hide mouse cursor when sliding from preview widget.
- Shit-key holded down during sliding in preview area makes
  sliding more accurate.
- Fixed bug with preview area refresh when disabling colors.
2011-07-23 18:37:20 +00:00
Sergey Sharybin
0fec30a35f Camera tracking integration
===========================

- Internal change: do not use maroses for checking the only
  one bit of track/marker flags.
- Do not display track name for disabled markers when
  "Show Disabled" is turned off.
- Option to lock tracks. Locked tracks can't be be moved,
  scaled, re-tracked and so.
2011-07-20 10:51:47 +00:00
Sergey Sharybin
146a184d2a Camera tracking integration
===========================

- Remove set but not used variable in clip buttons.
- Set keyframe when sliding marker with mouse.
- Also set keyframe when sliding from preview widget.
2011-07-19 10:40:22 +00:00
Sergey Sharybin
e42806a744 Camera tracking integration
===========================

- Sliding from preview could now be undone.
- Fixed memory leak caused by NULL-ing used scopes on
  layout restore.
- Fixed possible crash after splitting space clip.
2011-07-18 19:39:02 +00:00
Sergey Sharybin
426ca2ef89 Camera tracking integration
===========================

- Enable disabled markers when sliding from preview.
- Refresh space clip when marker is moving from preview.
2011-07-18 19:06:18 +00:00
Sergey Sharybin
3a6ea7b5e1 Camera tracking integration
===========================

- Track preview widget is now resizeable.
- Marker position could now be adjusted from track
  preview widget.
2011-07-18 14:54:32 +00:00
Sergey Sharybin
b18dd20aea Merging r38433 through r38453 from trunk into soc-2011-tomato 2011-07-17 17:25:11 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Sergey Sharybin
d279e8891f Camera tracking integration
===========================

- ColaMD moved from OpenNL to extern/.
  It'll be needed for libmv. Also, it's a bit updated from
  year 1999 to 2007.
  Need to be tested for regressions.
- Updated bundling script for libmv. Now it uses fuller
  subset of this library.
- Bundled new libmv.
- Request from Keir: add command line argument to toggle logging
  stuff on. Currently, if Blender is launched with -d argument
  libmv would start printing logging messages. There's no
  argument to increase verbosity, but there's API in libmv-capi,
  so it'll be easy to add.
- Finally fixed crash when ibuf is acquiring with user=NULL.
- Added ActiveClip property to the scene. This clip is used
  as default value for new match-moving constraints.
- Added some flags to Display panel of View3D. Related on
  displaying match-moving stuff.
- Internal change: bundles data moved inside to MovieTrackingTrack.
- Initial implementation of 3d reconstruction.
- Added constraint "Camera Solver". This constraint is supposed
  to be used to make camera follow the reconstructed camera path.
- Added "reference" property to "Follow Track" constraint.
  Now object could be "parented" to 2D track position or to
  3D bundle position.

The very quick guide:

To use reconstruction you should have footage with tracked markers,
choose two keyframes in "Tracking settings" panel. There should be
quite noticeable parallax effect between this two frames. This
is used to initialize reconstruction stuff.
Camera data (focal length and optical center) should be filled in
"Camera Data" panel. Optical center is often the center of image,
so it'll be filled in automatically.
You should also set values for undistortion (K1, K2 and K3). Currently,
there's no any visualization for this parameters and approach of
"change value -> reconstruct -> see what've changed" is the only way
for now.
Libmv team is working on auto-calibration tool, so it should be
easier to gather this coefficients in nearest (i hope) future.
There's also no scene orientation stuff.

Basic workflow:
- Open footage.
- Set markers and track them.
- Fill in camera data and keyframes.
- Hit "Solve Camera" button.
- Add "Camera Solver" constraint to camera in scene.
- Choose movieclip in that constraint.
- To see bundles in 3D viewport active clip should be set
  in scene buttons.
2011-07-07 17:58:33 +00:00
Sergey Sharybin
ef5110a033 Merging r38036 through r38196 from trunk into soc-2011-tomato 2011-07-07 17:48:22 +00:00
Brecht Van Lommel
4d7449b336 Fix part of #26811: absolute shape keys should not show influence value in list. 2011-07-07 11:01:36 +00:00
Brecht Van Lommel
ca2c319649 Fix #27850: keyboards with a comma instead of a dot on the numpad now get
converted to a dot when typing into number buttons, for easier number entry.
2011-07-04 10:56:59 +00:00
Campbell Barton
613e9b9926 changed the max decimal points to show from 7 to 6, since with float precision problems the median point of a selection could be 0.0000003 2011-07-03 13:20:21 +00:00