Blender Git Loki

Blender Git commits from all branches.

Page: 2237 / 2888

June 4, 2015, 10:47 (GMT)
Load image sequence collapsing for sequencer

Very dirty feature that will have to be reimplemented when the new asset engine makes it into blender.

This commit tweaks the filebrowser to detect sequences of images that form parts of a movie. The
files need to be in the format <number>filelame.ext or <number>.filename.ext

There is a new option next to hidden file option that makes it so this collapsing takes place.

When collapsing is on, any movie files that have the same filename will be collapsed to the first
detected file in the sequence. Selecting that file will select all files in the sequence.

There is a shortcut in the sequence editor in the Add menu, "Image Sequence" that enables collapsing
by default. Unfortunately, selecting multiple movies will not add multiple sequences to the sequencer,
at least for now, but it should make it quite easier for people to quickly select the whole range of
images for a movie. Importing the image sequence into the sequencer will use placeholders, so any missing images
will display as black.
June 4, 2015, 10:05 (GMT)
Merge branch 'master' into gooseberry

Conflicts:
intern/cycles/kernel/svm/svm.h
June 4, 2015, 08:28 (GMT)
dynamic fracture: relocated some functions and removed speed transfer from parent to child shards, it looked unrealistic, but TODO, animation often stops in case of fracture events....
June 3, 2015, 18:57 (GMT)
Merge branch 'master' into openvdb_smoke
June 3, 2015, 18:34 (GMT)
Various cleanup.
June 3, 2015, 17:53 (GMT)
Quick fix for data corruption happening when changing scene frame in
separate threads.

Patch by @lukastoenne.
June 3, 2015, 17:43 (GMT)
Quick fix for openvdb::ArithmeticError being thrown on frame 1.

Issue is that the smoke simulator stores a zero'd object matrix on frame
1 which makes OpenVDB throw because the matrix is then non-affine.

Patch by @lukastoenne.
June 3, 2015, 17:38 (GMT)
Quiet compile warning when WITH_OPENVDB is off.
June 3, 2015, 15:11 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 3, 2015, 15:07 (GMT)
Fix error when batch-rendering preview of scene with no world.
June 3, 2015, 15:00 (GMT)
Use thinner scrollbars for UILists as well

Todo: With the current default theme scrollbars are hard to see, we
could do better but that's for later.
June 3, 2015, 14:55 (GMT)
Fix bad ID preview clearing in RNA API.

Logic here was piece of crap... sigh.
June 3, 2015, 14:48 (GMT)
Merge branch 'master' into asset-experiments
June 3, 2015, 14:43 (GMT)
Adjust some theme colors

And the usual minor cleanup
June 3, 2015, 14:43 (GMT)
dynamic fracture: new option to limit the first impact (shard activation area can be limited to impact object)
June 3, 2015, 14:29 (GMT)
Arg, missed those in previous 'review' commit.
June 3, 2015, 13:49 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 3, 2015, 13:47 (GMT)
Address new review points.
June 3, 2015, 13:01 (GMT)
Cleanup: Use existing methods to init new/changed theme options

Think this is the way we should actually do this.
June 3, 2015, 12:15 (GMT)
Merge branch 'master' into asset-experiments
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021