Commit Graph

4155 Commits

Author SHA1 Message Date
Campbell Barton
b245dfbc06 svn merge ^/trunk/blender -r42466:42495 2011-12-07 18:29:21 +00:00
Sergey Sharybin
1b71790316 Update presets for tracking 2011-12-07 17:28:42 +00:00
Sergey Sharybin
d568f56f18 Merging remained part of hybrid tracker which adds correlation threshold
Keir's comment:
  Add support for detecting tracking failure in the ESM tracker component of
  libmv. Since both KLT and Hybrid rely on ESM underneath, KLT and Hybrid now
  have a minimum correlation setting to match. With this fix, track failures
  should get detected quicker, with the issue that sometimes the tracker will
  give up too easily. That is fixable by reducing the required correlation (in
  the track properties).

Command used for merge: svn merge -r 42396:42397 -r 42399:42400 ^/branches/soc-2011-tomato
2011-12-07 14:54:03 +00:00
Brecht Van Lommel
f96ac8c335 Fix #29518: uv cylinder/sphere unwrap from menu didn't work same as using U key menu. 2011-12-07 11:22:29 +00:00
Sergey Sharybin
d0c327c81c Fix #29432: Marquee Select Bug
Moved tweak threshold value to user preferences

This threshold might be needed to be tweaked when working with tables, i.e.
to prevent tap+slight movement be treated as tweak event.
2011-12-07 09:55:37 +00:00
Campbell Barton
35e80c5544 svn merge ^/trunk/blender -r42439:42466 2011-12-06 18:50:45 +00:00
Sergey Sharybin
3b1e077b39 Camera tracking: fixed typo in remove tracking preset button 2011-12-06 09:23:35 +00:00
Campbell Barton
4b73f587ee attempt to fix defione for qtcreator project file and cycles define. 2011-12-06 04:53:16 +00:00
Campbell Barton
04464c6cf9 more minor py edits 2011-12-05 23:05:16 +00:00
Campbell Barton
b44c82b4fd remove invalid NULL checks from own recent commit and minor pep8 edits. 2011-12-05 22:19:30 +00:00
Campbell Barton
cdc8b33111 svn merge ^/trunk/blender -r42422:42426 2011-12-04 23:39:01 +00:00
Daniel Salazar
577730daad 2011-12-04 22:48:23 +00:00
Campbell Barton
22a1ad61f9 svn merge ^/trunk/blender -r42372:42416 2011-12-04 18:39:19 +00:00
Thomas Dinges
b550cd8c1e Fix [#29502] Brush texture Preview panel doesnt show Alpha checkbox
* Added to the py UI file, it would require some deeper changes to have it in the c Template, can be done later.
* Fixed a typo.
2011-12-04 16:55:46 +00:00
Sergey Sharybin
d261623800 Camera tracking: merge hybrid tracker from tomato branch
Comment from Keir's commit:

Add a new hybrid region tracker for motion tracking to libmv, and
add it as an option (under "Hybrid") in the tracking settings. The
region tracker is a combination of brute force tracking for coarse
alignment, then refinement with the ESM/KLT algorithm already in
libmv that gives excellent subpixel precision (typically 1/50'th
of a pixel)

This also adds a new "brute force" region tracker which does a
brute force search through every pixel position in the destination
for the pattern in the first frame. It leverages SSE if available,
similar to the SAD tracker, to do this quickly. Currently it does
some unnecessary conversions to/from floating point that will get
fixed later.

The hybrid tracker glues the two trackers (brute & ESM) together
to get an overall better tracker. The algorithm is simple:

1. Track from frame 1 to frame 2 with the brute force tracker.
   This tries every possible pixel position for the pattern from
   frame 1 in frame 2. The position with the smallest
   sum-of-absolute-differences is chosen. By definition, this
   position is only accurate up to 1 pixel or so.
2. Using the result from 1, initialize a track with ESM. This does
   a least-squares fit with subpixel precision.
3. If the ESM shift was more than 2 pixels, report failure.
4. If the ESM track shifted less than 2 pixels, then the track is
   good and we're done. The rationale here is that if the
   refinement stage shifts more than 1 pixel, then the brute force
   result likely found some random position that's not a good fit.

svn command used: svn merge -r 42375:42376 -r 42377:42379 ^/branches/soc-2011-tomato
2011-12-04 13:26:11 +00:00
Sergey Sharybin
b7aefff198 Merging r42193 through r42349 from trunk into soc-2011-tomato 2011-12-02 19:40:20 +00:00
Andrew Wiggin
e883fa168b Adjust face menu links to "mirror uvs" and "mirror colors" to use the bmesh n-gon-compatible replacements "reverse uvs" and "reverse colors" 2011-12-02 17:17:40 +00:00
Andrew Wiggin
1906410cc2 Remove face menu (ctrl+f) links to f-gon commands 2011-12-02 16:56:05 +00:00
Campbell Barton
15ad39e684 svn merge ^/trunk/blender -r42303:42329 2011-12-02 01:01:07 +00:00
Dalai Felinto
1936b31cd0 renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)
Talked with Brecht and Campbell and they both agreed that bpy.types should match bpy.props
In the ideal world we would rename bpy.props to BooleanProperty. This would break scripts though. So we go for a compromise and at least have some consistency.
2011-12-01 22:08:42 +00:00
Campbell Barton
9e5b28cd42 svn merge ^/trunk/blender -r42261:42290 2011-11-30 09:31:11 +00:00
Sergey Sharybin
377d5232d4 Rename Movie to Movie Clip source for background image 2011-11-30 05:34:32 +00:00
Dalai Felinto
5763e6ce85 option to disable/enable individual background images
*** use-case:
"I have 10 reference images that overlap each other and every time I want to see one, I need to change the transparency of all the others.
therefore it would be nice to have a little button by each menu to allow enable/disabling individual background images"

To avoid subversioning bump I created a define that is negative (DISABLED) and of course a rna that is a boolean_negative.
Talked with Campbell and he actually prefers this way over do_version, so there it goes.
2011-11-29 21:05:18 +00:00
Sergey Sharybin
8bff756974 Reverting previous ZCombine commit.
ZCombine solves particular cases only and confused other cases.
2011-11-29 20:36:34 +00:00
Thomas Dinges
1a7ae3634d Blender 2.61 Release links and readme:
* Updated links to http://www.blender.org/development/release-logs/blender-261/
* Update readme file for 2.61
2011-11-29 20:13:20 +00:00
Campbell Barton
faa022563d svn merge ^/trunk/blender -r42245:42261 2011-11-29 18:18:56 +00:00
Sergey Sharybin
1ec4ceac7e Added Z-Combine node to default tracking scene setup 2011-11-29 17:41:15 +00:00
Sergey Sharybin
f382dda12d Fixed wrong operator usage in clip editor's reconstruction menu 2011-11-29 17:26:48 +00:00
Campbell Barton
5380545c97 svn merge ^/trunk/blender -r42221:42245 2011-11-29 06:58:16 +00:00
Bastien Montagne
ac88b67b30 Now wiki link in help menu opens the 2.6 index... Better to do it now than one day before release, and good incitation to finish 2.5/6 index before release! 2011-11-28 19:22:26 +00:00
Thomas Dinges
f64189573d * Never, ever use "col2" or something like that as UI variable name. 2011-11-28 17:10:32 +00:00
Campbell Barton
063dd4f60a svn merge ^/trunk/blender -r42197:42221 2011-11-28 17:09:13 +00:00
Sergey Sharybin
0b5ba70244 Rename tracking settings presets to something which makes more sense. 2011-11-28 16:10:50 +00:00
Sergey Sharybin
24cc4a6c21 Camera tracking: missed this presets files in previous commit 2011-11-28 13:27:48 +00:00
Sergey Sharybin
a3623a046b Camera tracking: merging tracking presets stuff from tomato branch
This commit implements:

- Configurable settings for newly creating tracks
  Now it's possible to set tracking algorithm and it's settings for
  all newly creating tracks including manual tracks creation and
  tracks creation by "Detect Features" operator.
- Moves margin, frames limit and adjust frame inside per-track
  settings.
  Was request from Francois for this.
- Adjust Frames replaced with menu called Pattern Match where it's
  possible to choose between matching pattern from keyframe frame
  or from previously tracked frame.
  Didn't see somebody used adjust frames values differ from 0 and 1,
  and this menu should make things more clear here/
2011-11-28 13:26:46 +00:00
Sergey Sharybin
48c5820049 Camera tracking: move margin, frames limit and adjust frames to per-track settings
Also replace adjust frames integer slider with menu to choose between matching
pattern from keyframe position of from previous frame. think this settings
wouldn't be so confusing now.
2011-11-28 13:08:12 +00:00
Campbell Barton
7553440aa4 svn merge ^/trunk/blender -r42172:42182 2011-11-27 01:42:56 +00:00
Sergey Sharybin
f5f4348e10 Camera tracking: presets for default tracking settings
Internal changes are almost finished, changes in the interface need to be discussed.
2011-11-26 21:09:29 +00:00
Sergey Sharybin
804ec83185 Merging r42160 through r42177 from trunk into soc-2011-tomato 2011-11-26 20:58:53 +00:00
Campbell Barton
616bf9bae3 check if an addon exists before getting its mtime 2011-11-26 17:41:56 +00:00
Campbell Barton
3b5bcab09c svn merge ^/trunk/blender -r42139:42172 2011-11-26 16:29:14 +00:00
Thomas Dinges
e07d4aed45 * Fix some wrong icon names in MESH_MT_vertex_group_specials, they caused errors.
Reported by Uncle_Entity in IRC.
2011-11-26 14:04:33 +00:00
Sergey Sharybin
aff993db55 Merging r42062 through r42159 from trunk into soc-2011-tomato 2011-11-25 15:32:23 +00:00
Sergey Sharybin
963f721128 Patch #29394: Error in VIEW3D_MT_EDIT_CURVE menu
Wrong shortcut was displaying for Curve -> Control Point -> Tilt operator

Patch by Mike Sloman, thanks!
2011-11-25 09:22:36 +00:00
Campbell Barton
f8affbb980 skip importing shutil on load. 2011-11-24 21:59:43 +00:00
Campbell Barton
4b3976cc5a svn merge ^/trunk/blender -r42116:42139 2011-11-24 20:01:45 +00:00
Campbell Barton
6e28ac2d7b pep8 edits and avoid naming conflicts with python builtins 2011-11-24 19:36:12 +00:00
Brecht Van Lommel
7187fd46c6 Fix wrong camera preset name D35 => D3S. 2011-11-24 13:07:02 +00:00
Campbell Barton
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
Sergey Sharybin
fe6a240111 Camera tracking: operator to setup scene for compositing things into footage
This operator does needed changes to

- 3D viewport
- Scene settings
- World settings
- Compositor
- Scene objects

in a way scene becomes ready to be composited into footage.

Known issue: preview doesn't work "out-of-box" after running this script,
selecting View node and hitting Tab helps. Not sure it can be solved
in nicer way at this moment.
2011-11-23 17:30:47 +00:00