9 years agoRemove debug code and clean up sources to match common style used
Sergey Sharybin [Thu, 17 May 2012 13:53:20 +0000 (13:53 +0000)]
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.

9 years agouse vertex arrays for drawing mask splines
Campbell Barton [Thu, 17 May 2012 12:08:37 +0000 (12:08 +0000)]
use vertex arrays for drawing mask splines

9 years agosvn merge ^/trunk/blender -r46699:46714
Campbell Barton [Thu, 17 May 2012 09:34:22 +0000 (09:34 +0000)]
svn merge ^/trunk/blender -r46699:46714

9 years agoadded readonly rna ID attribute ID.is_library_indirect, so python can tell if a link...
Campbell Barton [Thu, 17 May 2012 09:17:39 +0000 (09:17 +0000)]
added readonly rna ID attribute ID.is_library_indirect, so python can tell if a link is direct or not.

9 years agoFix own mistake: Open Collada libs are different for MinGW/MinGW64
Antony Riakiotakis [Thu, 17 May 2012 08:42:22 +0000 (08:42 +0000)]
Fix own mistake: Open Collada libs are different for MinGW/MinGW64

9 years agostyle cleanup: line length and ensure some macros error when not ending with ';'
Campbell Barton [Thu, 17 May 2012 07:59:25 +0000 (07:59 +0000)]
style cleanup: line length and ensure some macros error when not ending with ';'

9 years agoNitpicky stuff
Joshua Leung [Thu, 17 May 2012 02:50:07 +0000 (02:50 +0000)]
Nitpicky stuff
* Ensure "Base" is fully nullified before anyone uses it
* Force channel flush when changing Action Editor modes

9 years agoKeyingSets UI - Improving button layout for legibility of buttons
Joshua Leung [Thu, 17 May 2012 02:49:09 +0000 (02:49 +0000)]
KeyingSets UI - Improving button layout for legibility of buttons

* Use custom names for the keying options enum. The old automated layout dumped
out lengthy names which
didn't work well with the limited UI widths we were using, leading to all the
interesting stuff getting cropped out

* Moved the "array target" options to be in line with the rest of the target
specification stuff. I've ended up flattening that set of options into a single
row, which seems to work quite well.

* Removed label from grouping method enum. There was a perfectly good section
header above, and with narrow UI's, the name of this and the one below ended up
looking the same/confusing.

9 years agoAdd new planar tracker features and use the new planar API
Keir Mierle [Thu, 17 May 2012 02:31:52 +0000 (02:31 +0000)]
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.

9 years agostyle cleanup: block comments
Campbell Barton [Wed, 16 May 2012 23:37:23 +0000 (23:37 +0000)]
style cleanup: block comments

9 years agoFix for clay strips brush not showing Add/Subtract buttons.
Nicholas Bishop [Wed, 16 May 2012 22:27:45 +0000 (22:27 +0000)]
Fix for clay strips brush not showing Add/Subtract buttons.

9 years agoFix [#31432] Angles values stuck at 60 degrees.
Bastien Montagne [Wed, 16 May 2012 20:35:09 +0000 (20:35 +0000)]
Fix [#31432] Angles values stuck at 60 degrees.

9 years agoimprovements to mask editor path editing
Campbell Barton [Wed, 16 May 2012 18:05:35 +0000 (18:05 +0000)]
improvements to mask editor path editing
- adding new points de-selects previous so Ctrl+Click+Drag works usefully.
- cyclic curves now extrude properly
- adding new points inbetween existing now use the surrounding points handle length.

9 years agosvn merge ^/trunk/blender -r46684:46699
Campbell Barton [Wed, 16 May 2012 16:41:51 +0000 (16:41 +0000)]
svn merge ^/trunk/blender -r46684:46699

9 years agoevil mango feature, alt transform sequence strips bumps other strips out of the way
Campbell Barton [Wed, 16 May 2012 16:28:33 +0000 (16:28 +0000)]
evil mango feature, alt transform sequence strips bumps other strips out of the way

9 years agoNodes i18n: don't call gettext stuff twice for categories' names, when building Add...
Bastien Montagne [Wed, 16 May 2012 15:01:46 +0000 (15:01 +0000)]
Nodes i18n: don't call gettext stuff twice for categories' names, when building Add menu.

Now ui-names in foreach_nodeclass functions are only marked as translatable, it’s up to the callback to actually translate them or not!

9 years agoFix issue with linked dupli objects not being displayed in the viewport, if they
Brecht Van Lommel [Wed, 16 May 2012 14:36:15 +0000 (14:36 +0000)]
Fix issue with linked dupli objects not being displayed in the viewport, if they
have no object bounding box. Better fix will be to figure out why they are the
bounding boxes are not made.

Thanks to Campbell to tracking down the commit that caused this.

9 years agomodal operation for bevel and inset:
Antony Riakiotakis [Wed, 16 May 2012 14:30:41 +0000 (14:30 +0000)]
modal operation for bevel and inset:

This commit adds some first building blocks for the two operators to work modally based on mouse input. To make their function easier, two hotkeys are introduced, Ctrl+B for bevel and I for inset.

After discussion with Campbell, we would like to add scale-style line indicators for the operators. This is already done for transform operators but a new interface for mesh operations may have to be written using pieces from that code since, strictly speaking bevel and inset are not exactly "transform" operators.

Also, a better input method for inset is needed and more options exposed. The method implemented right now uses mouse move for thickness and ctrl-mouse move for depth. These are calculated using the distance of the selection center in screen space and the mouse position. While that may work and prevents abrupt changes in values when switching from thickness tweak mode to depth tweak mode, it limits the magnitude of values that can be put into the tool especially in small or large scale.

Alternatives until a better method is written include:

* use relative offset (works but may give strange results)
* tweak manually after the operation.

9 years agoSpell check fix (lenght -> length)
Bastien Montagne [Wed, 16 May 2012 14:25:25 +0000 (14:25 +0000)]
Spell check fix (lenght -> length)

Note: two remains, in comments in extern/bullet2/src/LinearMath/btVector3.h and extern/libmv/libmv/image/tuple.h.

9 years agoFix compile error with cmake + windows (reported by MiikaH)
Daniel Genrich [Wed, 16 May 2012 12:18:25 +0000 (12:18 +0000)]
Fix compile error with cmake + windows (reported by MiikaH)

9 years agostyle cleanup: indentation
Campbell Barton [Wed, 16 May 2012 12:14:31 +0000 (12:14 +0000)]
style cleanup: indentation

9 years agofix [#31320] Collada now supports import/export of loose edges (edges not attached...
Gaia Clary [Wed, 16 May 2012 11:21:03 +0000 (11:21 +0000)]
fix [#31320] Collada now supports import/export of loose edges (edges not attached to faces)

9 years agoFix #31369 (discussed in bug report comments). Setting the path/layer name strings...
Lukas Toenne [Wed, 16 May 2012 10:10:42 +0000 (10:10 +0000)]
Fix #31369 (discussed in bug report comments). Setting the path/layer name strings of the file/layer slots of the file output node would crash, due to missing pointer in the PointerRNA. Solved by using the iter-> pointer for the RNA collection iterator.

9 years agostyle cleanup: imbuf
Campbell Barton [Wed, 16 May 2012 09:26:37 +0000 (09:26 +0000)]
style cleanup: imbuf

9 years agoFix #31472: displace node wrong y derivative (simple typo). Credit to Ervin Weber...
Lukas Toenne [Wed, 16 May 2012 09:22:59 +0000 (09:22 +0000)]
Fix #31472: displace node wrong y derivative (simple typo). Credit to Ervin Weber (lusque) for the fix.

9 years agosvn merge ^/trunk/blender -r46632:46684
Campbell Barton [Wed, 16 May 2012 09:12:18 +0000 (09:12 +0000)]
svn merge ^/trunk/blender -r46632:46684

9 years agofix [#31474] Crash when object has parent and dupli_type == 'FRAMES' and show_x_ray...
Campbell Barton [Wed, 16 May 2012 08:42:50 +0000 (08:42 +0000)]
fix [#31474] Crash when object has parent and dupli_type == 'FRAMES' and show_x_ray, show_transparent are set to True

dupli objects should never be added to after-draw, added an assert to ensure this (and make fixing such bugs easier).

9 years agostyle cleanup: imbuf
Campbell Barton [Wed, 16 May 2012 07:38:23 +0000 (07:38 +0000)]
style cleanup: imbuf

9 years agoCPack rpm cleanup
Dan Eicher [Wed, 16 May 2012 02:51:58 +0000 (02:51 +0000)]
CPack rpm cleanup

-- package name and .spec->Version match
-- use find_lang macro for locales
-- Requires & Provides (mostly) match the fedora .spec
-- fix unpackaged file error for

TODO: figure out how persuade CPack to make multiple rpms to also package blenderplayer

9 years agoBugfix [#31469] 'cyclic offset' option is broken
Joshua Leung [Wed, 16 May 2012 02:40:14 +0000 (02:40 +0000)]
Bugfix [#31469] 'cyclic offset' option is broken

Removing this option from the UI. Cyclic offset and/or other the myriad of other
half-working walk/stride cycle stuff has been removed pending further review at
a later date about what's really needed, and the best way to do so with regards
to different rig types (i.e. setup antagonistic).

9 years agoCode cleanup: simplify standard GHash creation.
Nicholas Bishop [Wed, 16 May 2012 00:51:36 +0000 (00:51 +0000)]
Code cleanup: simplify standard GHash creation.

Added four new functions as shortcuts to creating GHashes that use the
standard ptr/str/int/pair hash and compare functions.

GHash *BLI_ghash_ptr_new(const char *info);
GHash *BLI_ghash_str_new(const char *info);
GHash *BLI_ghash_int_new(const char *info);
GHash *BLI_ghash_pair_new(const char *info);

Replaced almost all occurrences of BLI_ghash_new() with one of the
above functions.

9 years agostyle cleanup: pep8
Campbell Barton [Tue, 15 May 2012 18:50:51 +0000 (18:50 +0000)]
style cleanup: pep8

9 years agostyle cleanup: raytree code
Campbell Barton [Tue, 15 May 2012 18:45:20 +0000 (18:45 +0000)]
style cleanup: raytree code

9 years agoPython/CurveMapping: add Curve Mapping functions to add/remove curve points,
Brecht Van Lommel [Tue, 15 May 2012 18:34:00 +0000 (18:34 +0000)]
Python/CurveMapping: add Curve Mapping functions to add/remove curve points,
evaluate the curve and update after changes.

9 years agoUpdate create_vert_edge_map() to match create_vert_poly_map().
Nicholas Bishop [Tue, 15 May 2012 16:32:08 +0000 (16:32 +0000)]
Update create_vert_edge_map() to match create_vert_poly_map().

9 years agoFix cosmetic typos
Sergey Sharybin [Tue, 15 May 2012 16:11:04 +0000 (16:11 +0000)]
Fix cosmetic typos

Patch provided by Matteo F. Vescovi, thanks!

9 years agoRemove "Use Root Coordinates" from the interface
Sergey Sharybin [Tue, 15 May 2012 15:55:59 +0000 (15:55 +0000)]
Remove "Use Root Coordinates" from the interface

Seems it was never ported since 2.49 and currently makes no sense.

9 years agoFix for second part of #31445: Surface "Control Points" menu is empty
Sergey Sharybin [Tue, 15 May 2012 15:34:49 +0000 (15:34 +0000)]
Fix for second part of #31445: Surface "Control Points" menu is empty

The only difference that it should be Select Linked All operator added to the menu

9 years agoFix #31445: Surface "Control Points" menu is empty
Sergey Sharybin [Tue, 15 May 2012 15:28:59 +0000 (15:28 +0000)]
Fix #31445: Surface "Control Points" menu is empty

It is possible to create hook for surfaces, so display this entry
in Control points menu.

9 years agoTomato: fixes for marker sliding operator
Sergey Sharybin [Tue, 15 May 2012 15:05:45 +0000 (15:05 +0000)]
Tomato: fixes for marker sliding operator

- Fixed crash on slide undo. Was caused by some typos in slide
  data initialization and not checking for slide action in
  cancel callback
- Always create keyframe for frame when marker is stared sliding.

9 years agoFix: mirror modifier only mirrors first UV map (IRC report).
Brecht Van Lommel [Tue, 15 May 2012 15:02:02 +0000 (15:02 +0000)]
Fix: mirror modifier only mirrors first UV map (IRC report).

9 years agoTomato: fix usage of uninitialized variables in applyAspectRatio
Sergey Sharybin [Tue, 15 May 2012 14:44:32 +0000 (14:44 +0000)]
Tomato: fix usage of uninitialized variables in applyAspectRatio

Thanks Keir for pointing into issue!

9 years agoTomato: fixed crash when using manual calibration without GP strokes done
Sergey Sharybin [Tue, 15 May 2012 14:01:02 +0000 (14:01 +0000)]
Tomato: fixed crash when using manual calibration without GP strokes done

9 years agoCloth collisions:
Daniel Genrich [Tue, 15 May 2012 13:46:50 +0000 (13:46 +0000)]
Cloth collisions:

Add repulse for near vertices. This code didn't make sense where it was before. Still leaving it also at the old place since it cannot hurt.

9 years agoBlender Internal Render: Split quads to predictable (vertices 0,1,3) triangles for...
Daniel Genrich [Tue, 15 May 2012 13:39:44 +0000 (13:39 +0000)]
Blender Internal Render: Split quads to predictable (vertices 0,1,3) triangles for animated meshes.

This solves problems with collisions beeing rendered different than in viewport.

9 years agoFix for [#31464] Crash when issuing command line render engine list ("-E help")
Joerg Mueller [Tue, 15 May 2012 13:32:55 +0000 (13:32 +0000)]
Fix for [#31464] Crash when issuing command line render engine list ("-E help")

9 years agoA generalization of the modal node linking operator (for dragging from socket to...
Lukas Toenne [Tue, 15 May 2012 12:40:43 +0000 (12:40 +0000)]
A generalization of the modal node linking operator (for dragging from socket to socket).

This operator still had some built-in assumptions about the connectivity of input/output sockets (1-to-n in all current node systems). For future node systems (e.g. flow-based particles) and for general customizable nodes the operator is now fully symmetric and supports all kinds of connectivity limits (1:1, 1:n, m:1, m:n).

The operator data can also store a list of node links as opposed to a single link now, so that multiple links can be redirected at once. Holding the CTRL key when clicking a socket, all links from/to that socket are detached and can be moved to a different socket. This is useful for quickly appending a node without moving every individual link.

9 years agoCloth: Revert triangulation after talking with brecht.
Daniel Genrich [Tue, 15 May 2012 12:26:29 +0000 (12:26 +0000)]
Cloth: Revert triangulation after talking with brecht.

People: Better use subsurf after cloth since you can get failing collisions otherwise!

9 years agoFix #31449: multiple ClipEditor bug behaviour
Sergey Sharybin [Tue, 15 May 2012 12:25:26 +0000 (12:25 +0000)]
Fix #31449: multiple ClipEditor bug behaviour

Actually it wasn't a bug -- currently curve/dopesheet view are in separated
spaces, so to keep displaying data in sync it's needed to update all visible
clip editors when changing displaying clip datablock.

Changed logic here a bit, so current clip wouldn't be changes for clip editors
where view is set to CLIP, only dopesheet/graph views are getting updated.
Also do not update displaying clip datablock when changing it from curve/dopesheet.

9 years agoTag unused argument
Sergey Sharybin [Tue, 15 May 2012 12:17:56 +0000 (12:17 +0000)]
Tag unused argument

9 years agoFix [#31465] Segmentation Fault when Ctrl+Up/Down arrow to restore size of 3d Viewport.
Bastien Montagne [Tue, 15 May 2012 12:14:03 +0000 (12:14 +0000)]
Fix [#31465] Segmentation Fault when Ctrl+Up/Down arrow to restore size of 3d Viewport.

Simply added a check for NULL pointer...

9 years agoFix own compile error reported by brecht.
Daniel Genrich [Tue, 15 May 2012 12:07:44 +0000 (12:07 +0000)]
Fix own compile error reported by brecht.

9 years agoFix El Topo:
Daniel Genrich [Tue, 15 May 2012 11:35:01 +0000 (11:35 +0000)]
Fix El Topo:
- Library compile errors
- 2 Bugs (have been reported to lib owner)
- LAPACK for cmake

- Scons is still missing LAPACK lib define
- Do other platforms got LAPACK lib?

9 years agoCloth:
Daniel Genrich [Tue, 15 May 2012 11:14:50 +0000 (11:14 +0000)]
- Triangulate Cloth Mesh for collisions
- Speed up collisions
- Remove EL Topo code
- Prepare code to incooperate El Topo self collisions (TODO next commits)

- Triangulation: Is custom data/uv preserved correctly?
- Use MPoly not tessface?

9 years agoTomato: support of corners sliding for mouse sliding operator
Sergey Sharybin [Tue, 15 May 2012 10:55:26 +0000 (10:55 +0000)]
Tomato: support of corners sliding for mouse sliding operator

This commits re-enables mouse sliding operator which behaves in the same
way as it used to for search area and marker position, but for pattern
it's now using individual corners. This allows to define affine transformation
which later would be used by tracker algorithm.

For non-affine tracking code is also ported but currently it's hardcoded to
use affine transformation. When real affine trackers and RNA/DNA changes would
be commited, easy to switch sliding operator to old-school behavior for
non-affine patterns.

9 years agoFix bug #31460, crash in multires on leaving edit mode
Nicholas Bishop [Tue, 15 May 2012 07:37:42 +0000 (07:37 +0000)]
Fix bug #31460, crash in multires on leaving edit mode

Fix overly aggressive check for creating GridPaintMasks, wasn't
creating them in the right place after adding new faces in editmode.

9 years agoAdd 'area' mode for brush texture projection.
Nicholas Bishop [Tue, 15 May 2012 04:50:57 +0000 (04:50 +0000)]
Add 'area' mode for brush texture projection.

This is similar to the 'view' mode, but uses the average local surface
normal rather than the view normal for projection.

Original code by Jason Wilkins (GSoC).


9 years agoCode/UI cleanup: improvements for sculpt brush texture settings.
Nicholas Bishop [Tue, 15 May 2012 04:50:47 +0000 (04:50 +0000)]
Code/UI cleanup: improvements for sculpt brush texture settings.

Settings are shown in both the View3D toolbar and texture properties
panel; code is now in shared sculpt_brush_texture_settings() function

Also added a few new properties to the SculptCapabilities RNA to
replace "X in {Y, Z}" tests in the Python code.

9 years agoCode cleanup: refactor sculpt normal and related functions.
Nicholas Bishop [Tue, 15 May 2012 04:44:20 +0000 (04:44 +0000)]
Code cleanup: refactor sculpt normal and related functions.

9 years agoCode cleanups for sculpt-related code.
Nicholas Bishop [Tue, 15 May 2012 04:44:13 +0000 (04:44 +0000)]
Code cleanups for sculpt-related code.

* Renamed flip_coord as flip_v3_v3
* Added flip_v3 for same input/output
* Moved special case for grab brush's normal into calc_area_normal()
* Renamed 'fixed' texture mode as 'view plane', mirrors
  Brush.sculpt_plane terminology

9 years agoCleanup optimization compile flags for mingw-w64.
Antony Riakiotakis [Mon, 14 May 2012 23:36:07 +0000 (23:36 +0000)]
Cleanup optimization compile flags for mingw-w64.
After testing it seems that for safe debug sessions, debug build optimizations need to be off.

Also removed sse flags from release flags since they are included in ray optimization flags which are on by default.

9 years agoSequenceElements.pop() -- added 'index' argument instead of just chopping off the...
Dan Eicher [Mon, 14 May 2012 21:32:35 +0000 (21:32 +0000)]
SequenceElements.pop() -- added 'index' argument instead of just chopping off the last element

9 years agoPartial fix for bug #31458 Convex Hull operator crash
Nicholas Bishop [Mon, 14 May 2012 20:59:08 +0000 (20:59 +0000)]
Partial fix for bug #31458 Convex Hull operator crash

Change hull's point/triangle side test to > rather than >=.

This seems to fix the (infinite?) loop, but not the crash.

9 years agoFix precision issue for bmo_hull.interior_geom output slot.
Nicholas Bishop [Mon, 14 May 2012 20:58:59 +0000 (20:58 +0000)]
Fix precision issue for bmo_hull.interior_geom output slot.

Keep track of interior verts during the hull build to avoid
imprecise floating-point test afterward.

9 years agofix for odd mask curve handle calculation
Campbell Barton [Mon, 14 May 2012 19:41:27 +0000 (19:41 +0000)]
fix for odd mask curve handle calculation
- reuses auto handle calculation
- keeps handle length relate to surrounding handles

- only works well when cyclic is off
- isnt aspect aware (looks like other tools are not aspect aware too)

9 years agoPer-track grease pencil data blocks
Sergey Sharybin [Mon, 14 May 2012 17:23:37 +0000 (17:23 +0000)]
Per-track grease pencil data blocks

Added support of tracks to have their own grease pencil datablock.
This is controllable by Clip/Track toggle in Grease Pencil panel
in Clip Editor.

This toggle shows whether grease pencil stroke should go to movie clip's
datablock or to active track. As soon as this toggle is switched to Track,
all further strokes would be added to active track and only strokes which
belongs to active track would be displayed on the screen.

This strokes would be relative to track's position, which means if one
made some strokes to track and started moving it, stokes would be moved
together with track.

Different tracks might share the same grease pencil datablock.

Also hide draw modes which are not supported by space clip.

Initial idea why tracks should have grease pencil datablocks was to
support easy mask creation for tracking. This seemed fastest and
easiest way to achieve mask editing for tracks.

To get mask for specified track there's function BKE_tracking_track_mask_get
which requires MovieTracking structure, track for which mask is creating and
also width and height of current overall frame. it'll return ImBuf with
mask (probably it's more like overkill, because internally it works with
single-channel value buffer and probably that's one should be passing to

Probably hacking grease pencil in such way is not ideal solution, but that
part of code might be cleaned up further and it seems to be straightforward
to use grease pencil for such a purpose.

Note: this is commit to tomato branch, not to trunk.

9 years agoPatch [#31264] Elbeem Fixes by Jason Wilkins.
Daniel Genrich [Mon, 14 May 2012 16:19:58 +0000 (16:19 +0000)]
Patch [#31264] Elbeem Fixes by Jason Wilkins.

Thank you for submitting!

9 years agowhen adding new points to mask
Campbell Barton [Mon, 14 May 2012 15:59:53 +0000 (15:59 +0000)]
when adding new points to mask
- base when adding between 2 points use their handle types.
- when extruding an existing point use its handle type.

9 years agorevert 46626, which crashes blender during startup with fileno
Sv. Lockal [Mon, 14 May 2012 15:50:35 +0000 (15:50 +0000)]
revert 46626, which crashes blender during startup with fileno

There is a better way to fix this by zlib upgrade, which has its own open function for windows paths

9 years agofix for glitch adding markers, when there are 2 splines, and the first spline wasnt...
Campbell Barton [Mon, 14 May 2012 15:24:13 +0000 (15:24 +0000)]
fix for glitch adding markers, when there are 2 splines, and the first spline wasnt active but _was_ selected, Ctrl+Click would use the non-active selected spline.

now use the active spline when available.

also no need to de-select when adding a new vertex inbetween 2 verts in a spline.

9 years agosvn merge ^/trunk/blender -r46629:46632
Campbell Barton [Mon, 14 May 2012 14:55:10 +0000 (14:55 +0000)]
svn merge ^/trunk/blender -r46629:46632

9 years agoselect camera operator now works with view3d unlocked cameras,
Campbell Barton [Mon, 14 May 2012 14:39:21 +0000 (14:39 +0000)]
select camera operator now works with view3d unlocked cameras,
also corrected description.

9 years agoprevious lasso commit changed Ctrl+Click for adding markers making Ctrl+Click drag...
Campbell Barton [Mon, 14 May 2012 14:32:05 +0000 (14:32 +0000)]
previous lasso commit changed Ctrl+Click for adding markers making Ctrl+Click drag not work quite the same.

now Ctrl+Alt+LMB is lasso.

9 years agosvn merge ^/trunk/blender -r46612:46629
Campbell Barton [Mon, 14 May 2012 13:55:12 +0000 (13:55 +0000)]
svn merge ^/trunk/blender -r46612:46629

9 years agowas casting to short for int args.
Campbell Barton [Mon, 14 May 2012 13:54:00 +0000 (13:54 +0000)]
was casting to short for int args.

9 years agoRefactor byte/float RGBA to grayscale conversion in tracking.c
Keir Mierle [Mon, 14 May 2012 13:46:38 +0000 (13:46 +0000)]
Refactor byte/float RGBA to grayscale conversion in tracking.c

This is the first in a series of tracking.c refactorings to
disentangle functionality that is sprinkled across unrelated

9 years agoMake blender compilable by gcc-4.7 and strict compilation flags:
Sergey Sharybin [Mon, 14 May 2012 13:31:38 +0000 (13:31 +0000)]
Make blender compilable by gcc-4.7 and strict compilation flags:

- Remove strict flags from files, which are using FFmpeg stuff
  We're still using some symbols which are marked as deprecated.
  Ideally, we shall switch to new API, but it's a bit larger challenge
  because we don't want to break compatibility withotu actual need.
- Replace MAKE_ID with BT_MAKE_ID in bullet library.
  This is needed to prevent re-definition of MAKE_ID in bullet library.
  Seems it's only used to read blender files, so should be quite safe

9 years agoFix for BLI_gzopen to work with utf filenames in windows
Sv. Lockal [Mon, 14 May 2012 13:28:36 +0000 (13:28 +0000)]
Fix for BLI_gzopen to work with utf filenames in windows

9 years agoChanges to naming tracker vs. track vs. marker to match assumptions taken in
Sergey Sharybin [Mon, 14 May 2012 12:50:36 +0000 (12:50 +0000)]
Changes to naming tracker vs. track vs. marker to match assumptions taken in

9 years agocode cleanup: add WM_gesture_lasso_path_to_array, move mouse path to array conversion...
Campbell Barton [Mon, 14 May 2012 12:41:56 +0000 (12:41 +0000)]
code cleanup: add WM_gesture_lasso_path_to_array, move mouse path to array conversion there.

9 years ago"Efficient Second-order Minimization" for the planar tracker
Keir Mierle [Mon, 14 May 2012 12:15:38 +0000 (12:15 +0000)]
"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

9 years agolasso select for movie clip markers.
Campbell Barton [Mon, 14 May 2012 12:04:00 +0000 (12:04 +0000)]
lasso select for movie clip markers.

9 years agoStart migrating away from pat_min and pat_max for markers
Keir Mierle [Mon, 14 May 2012 10:47:25 +0000 (10:47 +0000)]
Start migrating away from pat_min and pat_max for markers

This starts converting 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:

- The preview widget does not respect the new
- The corners cannot yet be edited individually.
- The clamping does not do the right thing for general
  corners; e.g. detecting a convex quad.
- The tracking code in Blender does not actually invoke the
  corner tracking version of libmv's tracking API.

Next steps:

- Convert libmv's legacy ESM tracker and brute tracker to
  work under the new TrackRegion() API.
- Make Blender use the new TrackRegion() API; this will
  allow real planar tracking tests.
- Everything else (UI, etc).

This patch is mostly the work of Sergey Sharybin.

9 years agoAdd a planar tracking implementation to libmv
Keir Mierle [Sun, 13 May 2012 23:08:56 +0000 (23:08 +0000)]
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.

The ESM tracker, also known as the KLT tracker in the UI, is
temporarily changed to use the new Ceres-based planar
tracker in translation-only mode. Currently it is a bit
slower than ESM and also doesn't have all the bells and
whistles implemented. Those will come soon. Longer term,
both trackers will remain since Ceres is unlikely to be as
fast as ESM for pure translation solving, due to its

The next step is to implement a new tracking UI. The current
UI assumes a translational motion model; the new one must
support arbitrary perspective transforms of the pattern


9 years agostyle cleanup: imbuf & icons
Campbell Barton [Sun, 13 May 2012 22:05:51 +0000 (22:05 +0000)]
style cleanup: imbuf & icons

9 years agostyle cleanup: comments and whitespace
Campbell Barton [Sun, 13 May 2012 21:46:18 +0000 (21:46 +0000)]
style cleanup: comments and whitespace

9 years agostyle cleanup: mask, whitespace edits, also use len_squared_v2 for comparisons.
Campbell Barton [Sun, 13 May 2012 21:36:42 +0000 (21:36 +0000)]
style cleanup: mask, whitespace edits, also use len_squared_v2 for comparisons.

9 years agosvn merge: Merging r46558 through r46612, from trunk
Campbell Barton [Sun, 13 May 2012 18:16:25 +0000 (18:16 +0000)]
svn merge: Merging r46558 through r46612, from trunk

9 years agoChange the scons configuration for MinGW-w64 to be more in-line with cmake. Also...
Antony Riakiotakis [Sun, 13 May 2012 17:26:07 +0000 (17:26 +0000)]
Change the scons configuration for MinGW-w64 to be more in-line with cmake. Also deactivate openmp as it causes crashes when rendering with subsurf or multires modifiers

9 years agofix for crash when no mask exists when entering mask transform.
Campbell Barton [Sun, 13 May 2012 16:51:17 +0000 (16:51 +0000)]
fix for crash when no mask exists when entering mask transform.

9 years agostyle cleanup: mask files
Campbell Barton [Sun, 13 May 2012 16:24:42 +0000 (16:24 +0000)]
style cleanup: mask files

9 years ago* Typo fix: rna_recursiev_attr_expand -> rna_recursive_attr_expand
Thomas Dinges [Sun, 13 May 2012 16:23:17 +0000 (16:23 +0000)]
* Typo fix: rna_recursiev_attr_expand -> rna_recursive_attr_expand

9 years agostyle cleanup: macro line breaks
Campbell Barton [Sun, 13 May 2012 16:05:10 +0000 (16:05 +0000)]
style cleanup: macro line breaks

9 years agoAdds “align” option to snap to verts/edges/faces, for bones in Pose mode.
Bastien Montagne [Sun, 13 May 2012 16:01:59 +0000 (16:01 +0000)]
Adds “align” option to snap to verts/edges/faces, for bones in Pose mode.

Have to use a ugly hack, as for pose bones, rotscale transform matrix is not always the same as translate one... :/

Adresses feature request [#30979] snapping: "align rotation with the snapping target" and pose-mode.

9 years agocode cleanup:
Campbell Barton [Sun, 13 May 2012 14:47:53 +0000 (14:47 +0000)]
code cleanup:
- use bmesh iterator macros in more places
- rename scanfill variables (were using same names as mesh faces/verts which was confusing)

9 years agoAdd support for opencollada for MinGW64 and cmake
Antony Riakiotakis [Sun, 13 May 2012 13:32:48 +0000 (13:32 +0000)]
Add support for opencollada for MinGW64 and cmake

9 years agoCycles: OpenCL image texture support, fix an attribute node issue and refactor
Brecht Van Lommel [Sun, 13 May 2012 12:32:44 +0000 (12:32 +0000)]
Cycles: OpenCL image texture support, fix an attribute node issue and refactor
feature enabling #defines a bit.

9 years agofix geometry to origin in mesh editmode - was broken since bmesh merge.
Campbell Barton [Sun, 13 May 2012 11:14:43 +0000 (11:14 +0000)]
fix geometry to origin in mesh editmode - was broken since bmesh merge.

9 years agocode cleanup: use vector math function minmax_v3v3_v3() and other minor vector functi...
Campbell Barton [Sun, 13 May 2012 11:05:52 +0000 (11:05 +0000)]
code cleanup: use vector math function minmax_v3v3_v3() and other minor vector function edits.

9 years agoSequencer / Clip Editor:
Thomas Dinges [Sun, 13 May 2012 09:26:01 +0000 (09:26 +0000)]
Sequencer / Clip Editor:
* Make it more clear that the Memory Cache Limit is used by the Clip Editor as well.