Commit Graph

47594 Commits

Author SHA1 Message Date
Bastien Montagne
fccd8acb35 UI messages fixes... 2012-06-11 09:05:17 +00:00
Sergey Sharybin
7839e81ed5 Merging r47702 through r47726 from trunk into soc-2011-tomato 2012-06-11 09:00:11 +00:00
Nicholas Bishop
8015b7a4a5 Fix applying object transform to multires objects.
Bug [#31785] Applying a transform to an object with multires weird result

Was reading interleaved coord/mask data incorrectly since paint mask
merge. Fixed by using two separate CCGKeys.

Some additional code cleanup: deduplicate multires tangent matrix
calculation.
2012-06-11 08:37:35 +00:00
Jeroen Bakker
8a5252c1cb * Blur node had some irregularities at the edge of the screen
only visible when doing large size blurs.
 also solved the catcom/mitch filter that didn't work at low/medium quality

 PS never use BokehBlur Gausian filter as it is 99%+ identicat as non bokeh <= top for sergey- :)
2012-06-11 08:28:04 +00:00
Campbell Barton
31c8f4fbd3 fix for crashes in smooth-curves and clean-curves fcurve operators - missing NULL checks. 2012-06-11 08:15:37 +00:00
Sergey Sharybin
638211d4e6 Move all marker placement into a single omp critical section
Could give small speadup.
2012-06-11 08:06:42 +00:00
Campbell Barton
05c48fe7d8 quiet 'unused' warning. 2012-06-11 06:51:01 +00:00
Joshua Leung
61fe88aedc Bugfix [#27886] Transform constraint maps wrongly with negative scale
AFAIK, it is impossible to determine exactly which axes may have negative
scaling values from a 4x4 matrix (which is the underlying cause of this bug).
However, we can figure out if there is some negative scaling going on in that
matrix (i.e. one of the axes has negative scale). So, the fix here is to
negatively scale everything if we detect this happening.

WARNING: do not rely on being able to accurately detecting positive/negative
values for more than a single axis per bone controller. Weird results may occur.
You have been warned.
2012-06-11 05:05:05 +00:00
Joshua Leung
c2e55ae8e3 Bugfix [#28962] Changing actions via undo/delete all keyframes lacks UI refresh
Slightly hacky fix to get updates working for Action Editor header when there
are changes of the active action (via undo and/or deleting all keyframes at
once). Since the action referenced by the editor only gets updated when anim
channel filtering (e.g. as a result of the channel syncing operation) is
invoked. Added comments noting where these updates actually occur
2012-06-11 04:13:39 +00:00
Joshua Leung
a050d23133 Bugfix: Crash in Sequencer when trying to undo after using Grease Pencil
Grease Pencil data was not getting correctly relinked after file reload (for
undo)
2012-06-11 03:03:36 +00:00
Joshua Leung
be7d15cc2b Commented out expand_bones(), as this wasn't actually doing anything other than
wasting time traversing the list of bones in the Armature
2012-06-11 02:23:26 +00:00
Joshua Leung
26164634f8 Build-system fix (for r.47710)
Need add blenfont to list of include directories for sequence editor buildfiles.
Was causing build errors on OSX. Thanks Zavigny (IRC report)
2012-06-11 02:01:48 +00:00
Joshua Leung
128e2cb125 Grease Pencil Eraser - Numpad +/- and Scrollwheel Up/Down to change radius of
brush while erasing

This makes it easier to change the size of the brush without having to jump out
to the User Preferences and back
2012-06-11 01:27:56 +00:00
Joshua Leung
6486d7b35d Grease Pencil - Eraser is drawn with the circle/brush indicator again 2012-06-11 01:09:25 +00:00
Joshua Leung
c711665ce2 Code cleanup - Removing/commenting out various bits of legacy cruft related to
old Grease Pencil stuff
2012-06-11 00:46:22 +00:00
Joshua Leung
0df68aacb1 Grease Pencil - Support for Grease Pencil in the Sequence Editor preview/image
space works again

This commit restores the support for using Grease Pencil in the Sequence Editor
image preview region, making it possible to scribble on footage for review
purposes again. Due to internal changes in how the Sequencer handles the image
drawing for this stuff (i.e. it is now fully based on View2D instead of trying
to implement its own little crazy offset+zoom stuff), a lot of the old code for
handling those offsets is no longer needed. Instead, one of the "standard" cases
is now used, and works quite well.

Bugfixes:
* View-space Grease Pencil drawing was done in wrong place (before view2d
restore)
* Grease Pencil entry in RNA had wrong/missing type

Credits:
* DingTo - initial patch/attempt at restoring support
* Aligorith - solved the "offset problems"
2012-06-11 00:21:50 +00:00
Dan Eicher
f305261f14 OUTLINER_OT_material_drop -- Drag & Drop materials onto objects in the outliner
Adds the material at materials + 1 unlike the DnD view3d one which replaces the first one
2012-06-10 22:22:26 +00:00
Campbell Barton
869efe927c style cleanup 2012-06-10 22:13:17 +00:00
Tamito Kajiyama
8135cc9f95 Merged changes in the trunk up to revision 47700.
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
2012-06-10 20:50:43 +00:00
Campbell Barton
51e456a455 correct float vector sizes 2012-06-10 20:31:01 +00:00
Campbell Barton
113968aa15 quiet warning 2012-06-10 20:20:37 +00:00
Campbell Barton
9c504f6db2 correct freeing C++ arrays. 2012-06-10 20:14:15 +00:00
Campbell Barton
87abf43251 svn merge ^/trunk/blender -r47698:47701 2012-06-10 20:01:48 +00:00
Campbell Barton
51d9bf725d style cleanup 2012-06-10 19:59:02 +00:00
Mitchell Stokes
298feff390 Committing patch [#31704] "Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker. This patch fixes [#31671] "Keyboard Sensor blocks Quit Game Key Binding" 2012-06-10 19:32:57 +00:00
Sergey Sharybin
5f7c5d8765 Merging r47691 through r47698 from trunk into soc-2011-tomato 2012-06-10 18:47:36 +00:00
Sergey Sharybin
b57403eebc Make keying clamping operation complex so it might directly access input buffer
Seems to give quite noticeable speedup, but there's sometimes strange artifacts
showing as darker lines placed in along some kind of tiles.
Not sure what causes them yet.
2012-06-10 18:15:28 +00:00
Sergey Sharybin
ecbd2842dc Add screen balance into interface
Could be helpful to be played around. Default value is 0.5,
Most probably this default value should be set manually for
older files.
2012-06-10 17:41:04 +00:00
Sergey Sharybin
88748904c6 Also fix cache line in clip editor which didn't take start frame into account. 2012-06-10 17:24:05 +00:00
Sergey Sharybin
4e3a5663c5 Fixed curves and dopeseet views of motion tracking data not taking clip's
start frame into account.
2012-06-10 17:09:35 +00:00
Nicholas Bishop
b38e4506a6 Force multires update when changing subdivision type.
Fixes bug [#31050] Changing multires subdivision algorithm can ruin mesh
2012-06-10 17:06:26 +00:00
Nicholas Bishop
fa1d458b19 Code cleanups for the PBVH, no functional changes.
* Use the PBVHType consistently in pbvh_update_draw_buffers().

* Split the raycast function up, mesh and grid raycast get their own
  functions now.

* Replace duplicated code in BLI_pbvh_node_add_proxy() with call to
  BLI_pbvh_node_num_verts().
2012-06-10 16:37:22 +00:00
Sergey Sharybin
37f702addd Merging r47683 through r47690 from trunk into soc-2011-tomato 2012-06-10 16:26:00 +00:00
Nicholas Bishop
dc3645df1a Bugfix for autosmooth in sculpt mode.
This option was broken for non-multires meshes (not sure for how
long), as the pmap was not getting calculated.

Added a more general check for whether the pmap is needed, also added
an assert to warn about this in future.
2012-06-10 16:22:58 +00:00
Sergey Sharybin
bd81afdd5e Fix compilation without libmv 2012-06-10 16:16:02 +00:00
Sergey Sharybin
00bb315f4d Merging r47677 through r47683 from trunk into soc-2011-tomato 2012-06-10 16:09:03 +00:00
Sergey Sharybin
ff5875f1c1 Bump subversion so iteration through all markers would happen
only for old files which actually needs to be ported to 4 corners
representation.
2012-06-10 15:28:37 +00:00
Sergey Sharybin
25bb441301 Planar tracking support for motion tracking
===========================================

Major list of changes done in tomato branch:

- Add a planar tracking implementation to libmv
  This adds a new planar tracking implementation to libmv. The
  tracker is based on Ceres[1], the new nonlinear minimizer that
  myself and Sameer released from Google as open source. Since
  the motion model is more involved, the interface is
  different than the RegionTracker interface used previously
  in Blender.

  The start of a C API in libmv-capi.{cpp,h} is also included.

- Migrate from pat_{min,max} for markers to 4 corners representation

  Convert markers in the movie clip editor / 2D tracker from using
  pat_min and pat_max notation to using the a more general, 4-corner
  representation.

  There is still considerable porting work to do; in particular
  sliding from preview widget does not work correct for rotated
  markers.

  All other areas should be ported to new representation:

  * Added support of sliding individual corners. LMB slide + Ctrl
    would scale the whole pattern
  * S would scale the whole marker, S-S would scale pattern only
  * Added support of marker's rotation which is currently rotates
    only patterns around their centers or all markers around median,

    Rotation or other non-translation/scaling transformation of search
    area doesn't make sense.

  * Track Preview widget would display transformed pattern which
    libmv actually operates with.

- "Efficient Second-order Minimization" for the planar tracker

  This implements the "Efficient Second-order Minimization"
  scheme, as supported by the existing translation tracker.
  This increases the amount of per-iteration work, but
  decreases the number of iterations required to converge and
  also increases the size of the basin of attraction for the
  optimization.

- Remove 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.

    Not exposed into interface yet/

  * 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.

- Replace 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
        * Perspective

  * 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.

- Add light-normalized tracking

  Added the ability to normalize patterns by their average value while
  tracking, to make them invariant to global illumination changes.

Additional details could be found at wiki page [2]

  [1] http://code.google.com/p/ceres-solver
  [2] http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker
2012-06-10 15:28:19 +00:00
Sergey Sharybin
59ef51aa27 Initial Ceres integration into Blender
Currently only put sources of Ceres library into extern/libmv/third_party and
setup CMake and SCons building systems.

Integration details:

- Even CMake build files are not re-used from Ceres's trunk: they're using some
  automatic stuff detection like glog, pthreads, protobuf and so and it's not
  so clear how to re-use that files without modifications.
  And IMO it's easier if build files are getting re-generated automatically to
  match Blender-specific setup rather than keeping changes made locally in
  Blender in sync when re-bundling Ceres library. Especially in case when it's
  already needed to support SCons build system.
- Integrated only actual sources, all tests were stripped. Probably it'll be nice
  to have them, but they'll need clear integration with current module test stuff
  in Blender.
- Suitesparse was disabled. It'll help a lot having it, but there are some difficulties
  making cholmod working fine on windows. Would be added in future
- collections_port.cc was also stripped. It's not used by Ceres's upstream and
  it gives compilation error (undefined uint32 -- looks like namespace issue).
- Currently all schur eliminators are included. Not sure if it makes sense,
  also not sure if it makes sense having them switchable on and off -- IMO better
  to have single configuration which works and does not require special tweaks
  after everything was set up.

To bundle updated version of Ceres:
- Go to extern/libmv/third_party/ceres folder
- Run ./bundle.sh

This will checkout fresh Ceres snapshot of Windows branch (which is currently
most interesting from integration into Blender POV), apply all patches listed
in patches/series and copy needed files into Blender's working copy. This will
also re-generate CMake/SCons build rules.

If you'll need extra files from Ceres repository which are not present in
Blender, you'll need to copy them manually and then run ./mkfiles.sh from
extern/libmv/third_party/ceres folder which will update list of files used
by Blender.

Thanks to Leir Mierle and Sameer Agarwal (and all others who helped developing
Ceres) this library and thanks to Keir Mierle with help integrating it into Blender!
2012-06-10 15:27:41 +00:00
Sergey Sharybin
39e591d3d0 Support for per-track Grease Pencil datablocks for motion tracking
Originally was needed to reach easy way of defining masks used for tracking
(do eliminate textures which doesn't belong to feature when tracking.

Implemented as alternative to GP datablock for clip and added switch between
per-clip and per-track GP datablocks -- internal limitations of GP doesn't
allow to display all GP datablocks easily.  So either you see.edit GP associated
with clip or with track.

GP strokes associated with track are relative to track's position, following
tracks during tracking and could be shared between several tracks.

Masking code presents in libmv and there's rasterizer of GP datablocks for
masks in blender's tracking module, but they still need to be glued together.

Some documentation cound be found at this page:

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker#Grease_Pencil
2012-06-10 15:26:50 +00:00
Campbell Barton
5534701e5d style cleanup: use capital camel case names for typedef's 2012-06-10 15:20:10 +00:00
Lukas Toenne
10932e2e97 Fix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some circumstances now, so needs to check that. 2012-06-10 15:07:08 +00:00
Campbell Barton
f6e21881f5 change RNA_struct_find_function to accept a type rather then a PointerRNA, add a check duplicate functions are not defined. 2012-06-10 13:34:59 +00:00
Sergey Sharybin
fee1db86d3 Merging r47674 through r47676 from trunk into soc-2011-tomato 2012-06-10 12:37:41 +00:00
Sergey Sharybin
189f16362d Merging r47669 through r47673 from trunk into soc-2011-tomato 2012-06-10 12:33:30 +00:00
Campbell Barton
219eca0f51 mango request - add alpha to histogram & sample line. 2012-06-10 12:33:27 +00:00
Lukas Toenne
7496a58cfb Applied and completed a compositor patch by Brecht to use signalling and waiting in scheduling and worker threads instead of continuous loops with sleep times. This should help reduce unnecessary wait times in Tile. 2012-06-10 12:26:33 +00:00
Sergey Sharybin
00e05f1ade Merging r47667 through r47668 from trunk into soc-2011-tomato 2012-06-10 12:19:14 +00:00
Sergey Sharybin
8d5a43dd80 Merging r47662 through r47666 from trunk into soc-2011-tomato 2012-06-10 12:15:39 +00:00
Campbell Barton
5e29381825 mango request
- optionally display the histogram as lines (not filled areas).
- expand the enum for faster access.
- keep the sample line displayed after doing the line sample (running again clears).
2012-06-10 12:09:25 +00:00