Commit Graph

49420 Commits

Author SHA1 Message Date
Campbell Barton
a8a22d968c mask: remove aspect arguments which are no longer needed. 2012-05-18 09:36:32 +00:00
Sergey Sharybin
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
Lukas Toenne
ef87676262 Partial revert of r46542.
Displaying image layers with flattened names (render_layer.render_pass) can lead to extremely long socket lists, especially with older files that were used with distinct render layers before. In general the flattening of names would be preferable, but it needs a sensible way of limiting the number of displayed outputs. For now the render layer dropdown selection is the best option to ensure usability.
2012-05-18 09:26:55 +00:00
Campbell Barton
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
Nicholas Bishop
b5a6be37f1 Add smooth-shading option for remesh modifier.
The remesh modifier doesn't currently get any data from original
faces, so even if the input mesh was entirely smooth none of the
output faces would be. Solved by adding a new
dna-flag/rna-bool/UI-checkbox to smooth shade the output.

Requested by Daniel Salazar.
2012-05-18 06:10:47 +00:00
Keir Mierle
7414ccfeeb Add light-normalized tracking to the planar tracker
This commit adds the ability to normalize patterns by their
average value while tracking, to make them invariant to global
illumination changes.

To see this in action, check out the "Lobby" scene from Hollywood
VFX. If you track the markers that are shadowed by the actress,
previously they would not track. With the scale adaption on, the
tracker would shrink the area to compensate for the changed
illumination, losing the track. With "Normalize" turned on, the
patch is correctly tracked and scale is maintained.

A remaining problem is that only the Ceres cost function is
updated to handle the normalization. The brute translation search
does not take this into account. Perhaps "Prepass" (see below)
should get disabled if normalization is enabled until I fix the
prepass to normalize as well.

There are a few other changes:

- Cleanups in tracking RNA comments.

- Bail out of the sampling loop early if the mask is zero; this
  saves expensive samples of the image derivatives.

- Rename the wordy "Translation initialization" to "Prepass" at
  Sebastian's suggestion.

- Fix a bug where the mask was ignored when sampling in the cost
  functor.
2012-05-18 02:12:47 +00:00
Ove Murberg Henriksen
74a889d8b1 svn merge ^/trunk/blender -r46644:HEAD 2012-05-17 23:34:54 +00:00
Campbell Barton
5fe5a8c283 style cleanup: function definitions 2012-05-17 23:21:11 +00:00
Campbell Barton
c0bd076bfd style cleanup: and add missing files to cmake 2012-05-17 23:12:15 +00:00
Campbell Barton
7862b2fa13 style cleanup: compositor, pointer syntax, function brace placement, line length 2012-05-17 22:55:28 +00:00
Nicholas Bishop
69b95e1a8a Code cleanup: de-duplicate some transform constraint code.
No functional changes.
2012-05-17 22:52:42 +00:00
Antony Riakiotakis
18b795b476 Don't link compositor with blender player. 2012-05-17 22:47:05 +00:00
Keir Mierle
d78b7fc946 Fix the brute-force toggle in the motion tracker. 2012-05-17 20:21:26 +00:00
Campbell Barton
db46f9b552 fix a bug and storing a bool as a float 2012-05-17 18:55:34 +00:00
Nicholas Bishop
b5a6afd767 Enable remesh modifier for curves. 2012-05-17 17:16:51 +00:00
Keir Mierle
82e45dd275 Add panels for the new planar tracker
This replaces the old style tracker configuration panel with the
new planar tracking panel. From a users perspective, this means:

- The old "tracking algorithm" picker is gone. There is only 1
  algorithm now. We may revisit this later, but I would much
  prefer to have only 1 algorithm. So far no optimization work
  has been done so the speed is not there yet.

- There is now a dropdown to select the motion model. Choices:

  * Translation
  * Translation, rotation
  * Translation, scale
  * Translation, rotation, scale
  * Affine (Not implemented yet)
  * Perspective

  The most stable is the "translation" parameterization. The
  others work but still require some tweaking.

- The old "Hybrid" mode is gone; instead there is a toggle to
  enable or disable translation-only tracker initialization. This
  is the equivalent of the hyrbid mode before, but rewritten to work
  with the new planar tracking modes.

- The pyramid levels setting is gone. At a future date, the planar
  tracker will decide to use pyramids or not automatically. The
  pyramid setting was ultimately a mistake; with the brute force
  initialization it is unnecessary.
2012-05-17 17:09:51 +00:00
Sergey Sharybin
9932bb1dd6 Tomato: sliding corner with Ctrl holded down would have scaling behavior 2012-05-17 16:45:02 +00:00
Campbell Barton
2c23bb8389 rna function Image.scale(w, h), useful for utility functions to open/scale/save images. 2012-05-17 15:26:11 +00:00
Campbell Barton
81016d59b6 fix for building without aud 2012-05-17 15:01:51 +00:00
Campbell Barton
a31de14b2e fix for building without AUD 2012-05-17 14:59:11 +00:00
Thomas Dinges
22942ac74b Compositor / Box and Ellipse Mask:
* "X/Y position" label -> "X/Y". The longer text was barely visible in the UI.
2012-05-17 14:55:01 +00:00
Jeroen Bakker
29e407d37b Moved switch node to layout 2012-05-17 14:02:01 +00:00
Sergey Sharybin
1670b1ed99 Remove debug code and clean up sources to match common style used
Also made BKE_tracking_get_search_imbuf use space conversion utility functions,
so now it's not so annoying that search area calculation is happening differently
in different paces.

Also allow even sizes for search area.

Another small fix is about flipping search area dumping by libmv-capi.
It used to be flipped since in blender Y axis is up-aimed.
2012-05-17 13:53:20 +00:00
Campbell Barton
979f6bab9c style cleanup: braces, compositor 2012-05-17 13:44:15 +00:00
Antony Riakiotakis
fe0d1a3810 Fix blenderplayr compilation 2012-05-17 13:30:20 +00:00
Jeroen Bakker
aeb3c0f70e Fix for MSVC float conversion 2012-05-17 13:25:41 +00:00
Bastien Montagne
ef3be824a0 Fix [#31495] Modifiers in Text objects don't respect edit mode flag.
Need to also check for cu->editfont for text edit mode...

Also use modifier_isEnabled() to make general tests whether a modifier should be applied or skipped.
2012-05-17 13:22:19 +00:00
Antony Riakiotakis
9b42b99649 MinGW64 and possibly gcc 4.7 doesn't like interface as identifier. 2012-05-17 13:15:58 +00:00
Campbell Barton
463898014f code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake) 2012-05-17 13:10:34 +00:00
Joshua Leung
a00cc81efb readfile.c Style Cleanup: Whitespace, while -> for, etc.
(3rd time lucky!)
2012-05-17 12:59:34 +00:00
Jeroen Bakker
044e818cf8 ____
`````|````` | |        |                        ..'''' 
     |      | |        |______               .''       
     |      | |        |                  ..'          
     |      | |_______ |___________ ....''             
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas Tönne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffrén
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bjørnar Frøyse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    François Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    Jérôme Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó, 
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli, 
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein, 
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio, 
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel, 
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey, 
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter, 
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini, 
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch, 
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson, 
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song, 
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
Ove Murberg Henriksen
8521ca69fa removed:
OBJECT_OT_vertex_group_copy_to_selected_single()
plan for future to implement option as an argument in:
OBJECT_OT_vertex_group_copy_to_selected()
2012-05-17 12:36:07 +00:00
Ove Murberg Henriksen
044fd86a15 Some changes to structure as a response to review.
(I still havent adressed all issues.)
2012-05-17 12:15:39 +00:00
Campbell Barton
fddb05024e use vertex arrays for drawing mask splines 2012-05-17 12:08:37 +00:00
Bastien Montagne
eb57856a19 Fix select_similar_type_itemf() enum-item-generator func to return the whole prop_similar_types when context is NULL (needed at least by i18n tools!). 2012-05-17 10:42:24 +00:00
Campbell Barton
dde529e977 remove doubleups of newlines in readfile error prints 2012-05-17 10:31:06 +00:00
Joshua Leung
f9043865a2 Disable setting non-object actions as the action used by the Action Constraint
(... I could've sworn there used to be some dynamic enums for filtering actions
by root type)
2012-05-17 10:28:30 +00:00
Joshua Leung
c7c937547b KeyingSets UI stuff - Replaced names used in RNA enum instead of redefining
manually in UI files
2012-05-17 10:10:11 +00:00
Campbell Barton
c406ce2974 minor improvement - entering "//somepath" in the file selector didnt expand from the current blend files path.
also quiet warning.
2012-05-17 10:07:29 +00:00
Ove Murberg Henriksen
f4f5254100 cleanup: Style = adding spaces around operators. 2012-05-17 09:47:11 +00:00
Campbell Barton
37f6ed397d svn merge ^/trunk/blender -r46699:46714 2012-05-17 09:34:22 +00:00
Campbell Barton
dfa075b662 added readonly rna ID attribute ID.is_library_indirect, so python can tell if a link is direct or not. 2012-05-17 09:17:39 +00:00
Ove Murberg Henriksen
daa4b41fb2 Fucntions adjusted to support options.
(still lacking feature for selected and option for all)
2012-05-17 08:10:19 +00:00
Campbell Barton
599d213115 style cleanup: line length and ensure some macros error when not ending with ';' 2012-05-17 07:59:25 +00:00
Ove Murberg Henriksen
e7970575ef bugfix (using _all not _single as postfix for functions); 2012-05-17 03:18:47 +00:00
Ove Murberg Henriksen
506057c83b Fixed readabillity of options framework by adding enums. 2012-05-17 03:15:39 +00:00
Joshua Leung
27f224f12a Nitpicky stuff
* Ensure "Base" is fully nullified before anyone uses it
* Force channel flush when changing Action Editor modes
2012-05-17 02:50:07 +00:00
Keir Mierle
0a917fa1c3 Add new planar tracker features and use the new planar API
This commit removes the use of the legacy RegionTracker API from
Blender, and replaces it with the new TrackRegion API. This also
adds several features to the planar tracker in libmv:

- Do a brute-force initialization of tracking similar to "Hybrid"
  mode in the stable release, but using all floats. This is slower
  but more accurate. It is still necessary to evaluate if the
  performance loss is worth it. In particular, this change is
  necessary to support high bit depth imagery.

- Add support for masks over the search window. This is a step
  towards supporting user-defined tracker masks. The tracker masks
  will make it easy for users to make a mask for e.g. a ball.

- Add Pearson product moment correlation coefficient checking (aka
  "Correlation" in the UI. This causes tracking failure if the
  tracked patch is not linearly related to the template.

- Add support for warping a few points in addition to the supplied
  points. This is useful because the tracking code deliberately
  does not expose the underlying warp representation. Instead,
  warps are specified in an aparametric way via the correspondences.

- Remove the "num_samples_xy" concept and replace it with
  automatic determination of the number of samples. This makes the
  API easier for users.

- Fix various bugs in the parameterizations.

There remains a bug with subpixel precision tracking when in
"keyframe" mode; this will get fixed shortly.
2012-05-17 02:31:52 +00:00
Ove Murberg Henriksen
0978d1eb9d Added framework for transfer weight options.
vertex_group_transfer_weight_exec() governs all.
Functions renamed/added with _transfer_weight_
as opposed to _copy_by_ 
This is to reflect changes in parameters and usage as the internal code will change.
2012-05-17 01:42:06 +00:00
Campbell Barton
9dd981a440 style cleanup: block comments 2012-05-16 23:37:23 +00:00