Commit Graph

47594 Commits

Author SHA1 Message Date
Bastien Montagne
436b63eea5 Fix [#31535] Radian Unit System Button Ignored for Face Angles display.
Also avoid multiplying each vertex three times with obmat...
2012-05-19 20:16:29 +00:00
Sergey Sharybin
ca446f090b Fix aspect ratio correction for translating motion tracking data
Still has got some issues when translating masks.
2012-05-19 16:55:20 +00:00
Campbell Barton
ed679693c9 style cleanup: whitespace/indentation 2012-05-19 13:55:54 +00:00
Campbell Barton
af3e348430 code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars. 2012-05-19 13:28:19 +00:00
Campbell Barton
009689fc76 svn merge ^/trunk/blender -r46714:46724 --- before tile branch merge 2012-05-19 11:11:00 +00:00
Campbell Barton
2f5173887e disable overwriting the PYTHONPATH for windows - reported as [#31506] 2012-05-19 10:10:49 +00:00
Bastien Montagne
f8f282fc96 Add i18n to “button” and “Area Options” pop-up menus. 2012-05-19 09:46:41 +00:00
Tamito Kajiyama
a5152b7ca0 Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +00:00
Sergey Sharybin
c5dd787933 No need to invert brute and normalization flags in rna.
Also remove currently unused update callback.
2012-05-18 19:22:50 +00:00
Brecht Van Lommel
e499df7b39 Fix #31504: uv unwrap incorrectly scaling pinned islands. 2012-05-18 15:20:45 +00:00
Brecht Van Lommel
d2895f0a59 Fix #31395: setting mesh.uv_textures['uvmap'].active did not update correctly. 2012-05-18 15:06:26 +00:00
Brecht Van Lommel
29a1a05aa5 Fix #31430: itasc solver assertion failure with debug builds. 2012-05-18 15:06:23 +00:00
Campbell Barton
ec142edaa0 code cleanup: use for loops for mask/spline looping 2012-05-18 14:49:30 +00:00
Brecht Van Lommel
f53e6166fb add missing include 2012-05-18 14:08:54 +00:00
Brecht Van Lommel
74367ae091 Fix #31400: opengl offscreen render not respecting theme settings. 2012-05-18 14:05:59 +00:00
Brecht Van Lommel
578864180b Fix related to #31446: cycles glsl error with empty image texture node. 2012-05-18 13:30:34 +00:00
Benoit Bolsee
894dd820ac Fix bug in controller list scan (introduced in recent code cleanup) 2012-05-18 13:27:33 +00:00
Campbell Barton
2870366d72 rename 'mask shape' to mask object, will make adding shape keys less confusing. 2012-05-18 12:51:11 +00:00
Brecht Van Lommel
adb567f6b3 File browser: list of system directories is now refreshed on pressing the refresh
button or opening the file browser, in case e.g. a USB stick was inserted.

Patch #31211 by Julien Duroure.
2012-05-18 12:49:25 +00:00
Campbell Barton
76f28921dc add option for screw modifier to smooth shade. (renamed smooth_shading to use_smooth_shade for remesh modifier too) 2012-05-18 10:37:49 +00:00
Campbell Barton
181f3670c9 patch [#31507] site not automatically imported when using external python package
made some modificatons to normal python startup also.
2012-05-18 10:19:49 +00:00
Campbell Barton
f82bb6fb4e fix error with mask translation not quite following the mouse. 2012-05-18 10:02:14 +00:00
Lukas Toenne
f55b6a5331 Fix for Tile image node. This was still using the path string for multilayer output instead of the dedicated layer name string. 2012-05-18 10:00:31 +00:00
Lukas Toenne
e74de72b96 When generating enums for the image node render layers, replace empty strings with a simple space character. This little hack allows the enum item to be selected from the dropdown list. 2012-05-18 10:00:28 +00:00
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