Blender Git Commits

scons + mingw Compile Fixes for r.59942

* SCons files for guardedalloc module requires all the source files to be listed out, like in CMake.

* mingw32 (or at least gcc 4.6.2) seems to follow the Windows convention of using _msize() instead of having a "malloc_usable_size()"

Added an option to pin the operator redo panel. When it is pinned it stays open when the toolbar is closed.

Merging r60012 through r60068 from trunk into soc-2013-depsgraph_mt

Dividers can now be dragged. Buttons display a bit of text if there is no icon yet.

Modify modal solver to use only camera 0

Match recent changes to how tracks are stored.

merge with trunk -r 60055

Dividers can be folded, but not dragged yet.

Clearer association between markers and cameras

As the camera identifier associated with a marker is simply bookkeeping for multicamera reconstruction, make it an optional attribute when handling tracks and reconstructed views. This means that the libmv API is still nice for users that don't need to associate images with cameras.

Added dividers and made the tool shelf context dependent

Merging from trunk r60041 into soc-2013-motion_track

Fix: BKE tracking compilation error

Previous commit was incomplete and didn't include blender-side changes to the libmv API.

Modify data structure for storing tracks

The Tracks data structure stores Markers. The current design has it so that a marker's image identifier denotes the frame from the associated camera that the marker belongs to. That is, it treats the image identifier more as a frame identifier. You could have markers in image 0 for camera 0 and image 0 for camera 1 and they wouldn't be considered to be in the same image.

However, this design doesn't make much sense because the reconstruction algorithms don't care about frames or the cameras from which a frame came, only that there is a set of images observing the same scene. A better design is for all frames from all cameras to have unique image identifiers. The camera identifiers can then denote a subset of those images. No image captured by camera 0 will have the same image identifier as images from camera 1. This way, the algorithms can continue to just treat all frames as one big set of images and the camera identifier provides the association of an image to the camera it originated from. This makes it much easier to implement multicamera reconstruction without significant changes to the way libmv behaves.

Implemented drag and drop for the icon shelf. Removed code for menubar menus that was commented out.

Merging r59941 through r60011 from trunk into soc-2013-depsgraph_mt

Merged revision(s) 59995-59999 from trunk/blender into soc-2013-dingto.

Yeah I know. :P

Small tweaks to the custom panel button dragging.

Update doxygen comments for reconstruction initialization

EuclideanReconstructTwoFrames and ProjectiveReconstructTwoFrames currently assume that the passed markers belong to a single camera. That is, we're not reconstructing frames from different cameras. Ideally, this restriction should be removed.

Merged revision(s) 59930-59994 from trunk/blender into soc-2013-dingto.

Fix for OSL volume closure flattening, this was not copying settings from the OSL closures.

Removed invalid code from volume closure, the OSL distinction has to happen on a different level and doesn't make any sense. The function body works in both SVM and OSL case.