Commit Graph

10681 Commits

Author SHA1 Message Date
916524d650 Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled.
Also corrected some typos in movieclip.
2012-06-08 17:16:32 +00:00
04766ab071 Added sorting by average reprojection error to motion tracking dopesheet. 2012-06-08 16:42:24 +00:00
Lukas Toenne
5e1bbde01d Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed.
The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/
2012-06-08 16:17:57 +00:00
511ee1175a svn merge ^/trunk/blender -r47603:47611 2012-06-08 14:49:07 +00:00
b33c5168f4 mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc). 2012-06-08 14:31:38 +00:00
26f9fe3962 Merging r47581 through r47603 from trunk into soc-2011-tomato 2012-06-08 09:36:17 +00:00
4413903370 support for subframe animation evaluation for masks. 2012-06-08 09:35:51 +00:00
ae3062b741 fix for own bug - evaluating past the last frame of a mask didnt work at all. 2012-06-08 09:27:40 +00:00
fc07b1fce3 Mask editing: remove use_parent property and use check if paren't id is set instead 2012-06-08 07:54:46 +00:00
186f542b79 remove casts to short when allocating new imbufs. 2012-06-07 18:33:36 +00:00
bdf9e02346 new sequence strip type for masks. 2012-06-07 18:24:36 +00:00
32530c2827 Quite some warnings... 2012-06-07 18:21:07 +00:00
9387018122 Merging r47572 through r47580 form trunk into soc-2011-tomato 2012-06-07 18:08:57 +00:00
8a500eea9a Avoid imbuf loading when getting movie clip size
This prevents high memory usage by non-proxied frames when doing mask parenting.

Description from code:

  Originally was needed to support image sequences with different image dimensions,
  which might be useful for such things as reconstruction of unordered image sequence,
  or painting/rotoscoping of non-equal-sized images, but this ended up in unneeded
  cache lookups and even unwanted non-proxied files loading when doing mask parenting,
  so let's disable this for now and assume image sequence consists of images with equal sizes
2012-06-07 16:15:24 +00:00
105b1031dd code cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines. 2012-06-07 15:49:02 +00:00
4ac1e1b222 Merging r47535 through r47566 from trunk into soc-2011-tomato 2012-06-07 09:32:39 +00:00
a99b9a5c3d Fix #31725: UV map order is ignored when opening in 2.6+ versions
Issue was caused by do_versions being used pdata as reference for active/render/
stencil/clone layer indices instead of fdata.

Added some utility functions used only by do_versions to be sure this indices
are set from fdata for pre-bmesh files.
2012-06-07 09:11:16 +00:00
e261d5ca3b improvement to handle recalculation, only do this on auto-handles when they are in a spline. 2012-06-07 07:28:55 +00:00
ffd75901f3 Code cleanup - Shuffled solve_parenting() function around to remove need for
forward def/local prototype
2012-06-07 05:39:28 +00:00
e69ec8be55 Bugfix [#31735] Performance issue related to object parenting to armature
In the file included with the bugreport, framerates were dropping from 60fps to
11fps for an armature with several lattices parented, and a 5fps drop everytime
an object was parented to the armature.

Upon (re-)inspection of the code, it became apparent that this was being caused
by a block of code that would recalculate the parent (perhaps recursively) as it
thought the parent state was for the wrong timestamp. However, the timestamps
this was using was never really updated (except for a single place, which set it
to a single fixed value to force recalculations to take place), which meant that
this branch was run all the time. AFACT, this is a remnant from some of the old
timeoffset stuff + pre-Depsgraph timestamping hacks that are no longer used/set.
2012-06-07 05:29:10 +00:00
d5032657ed style cleanup 2012-06-06 22:38:39 +00:00
052e34cc3d fix for bug where auto-handles were not calculated correctly for animated curves. 2012-06-06 20:26:26 +00:00
3e8ad394af code cleanup: remove unused mask args 2012-06-06 20:05:58 +00:00
286c5915b3 Merging r47507 through r47534 from trunk into soc-2011-tomato 2012-06-06 19:11:06 +00:00
f43a733f59 Changed semantic of recently added start_frame
Now it's indicates at which scene frame number movie clip starts playing back.
This this setting is still belongs to clip datavlock and used by all users of
clip such as movie compositor nodes, constraints and so.

After long discussion and thoughts about this it was decided that this would
match image's current behavior (which initially seen a bit crappy), but that's
actually allows:

- Keep semantics of start frame in image and clip datablocks in sync
- Allows to support features like support of loading image sequences
  with crappy numbers in suffix which doesn't fit long int.
- Allows to eliminate extra boolean checkbox to control such kind of offset.

Hopefully from pipeline POV it wouldn't hurt because idea of having this things
implemented in original way was  working only if sequence before processing
started naming form 001.
2012-06-06 18:58:30 +00:00
1931aac1f7 style cleanup: (indentation) 2012-06-06 14:48:39 +00:00
0499200e39 Cloth: Add support for "Self Collision Vertex Group".
Self collision vertex groups enable artists to exclude selected vertices from getting involved in self collisions. This speeds simulations and it also resolves some self collision issues.
2012-06-06 13:30:05 +00:00
d6ebba4c9e recalc animated mask deformations on load. 2012-06-06 12:48:02 +00:00
870ba8aa13 svn merge ^/trunk/blender -r47423:47506 2012-06-06 10:25:59 +00:00
eedaaee072 fix for building without smoke. 2012-06-06 05:37:38 +00:00
cb0b3558af style cleanup 2012-06-05 22:12:17 +00:00
465b11e971 operator to reset feather weights on all shape keys 2012-06-05 19:39:12 +00:00
0d61876ed0 Configurable start frame for movie clip datablocks as alternative to automatic start frame number
Number of start frame in opened image sequence used to be distinguished automatically
in a way that file name used on open would be displayed at scene frame #1.

But sometimes it's useful to have it manually configurable (like in cases when you're
processing image sequence and replacing clip's filepath to postprocessed image sequence
and want new clip to show at the same frame range as it was rendered from).

Added Custom Start Frame flag to movie clip (could be accessed from Footage panel in
clip editor) and Start Frame which means number of frame from sequence which would
be displayed at scene frame #1.

For example if you've got clip pointing to file render_00100.png and Start Frame of 100
this file would be displayed at scene frame #1, if Start Frame is 1 then this image
would be displayed at scene frame #100,
2012-06-05 18:38:09 +00:00
fe58f668a1 mask point slide now accounts for scaled bezier weights, 2012-06-05 12:51:11 +00:00
f72c8565bf change how the weight for feather points are calculated with masking, instead of using absolute weights, multiply by by the weights of the adjacent beziers.
without this - there was no way to animate the overall feather influence of the feather.

will update tools to account for this next.
2012-06-05 12:22:02 +00:00
49cc9c7502 code cleanup: mask feather weight - add in checks for u==1 or u==0 2012-06-05 12:09:24 +00:00
aca2e6a739 code cleanup: helper functions for masking. 2012-06-05 11:46:55 +00:00
dd198685c4 code cleanup: var names in mask code 2012-06-05 11:28:54 +00:00
ae8103240d mask editing
- clear feather weights (alt+s)
- fix for glitch where placing the feather would jitter.
2012-06-05 09:37:44 +00:00
0c59218a1d mask switch direction now swaps handle direction too 2012-06-05 07:01:43 +00:00
a0f5e200cc fix for possible uninitialized pointer use in mask rasterize and remove some dead code. 2012-06-05 06:54:18 +00:00
4260804c00 Fix NULL free warning in multires. 2012-06-04 23:14:57 +00:00
5189356d58 style cleanup 2012-06-04 20:11:09 +00:00
4e338e894f Cycles: support for image sequences in image/environment texture node. 2012-06-04 19:38:33 +00:00
68a9dd54ec mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.
see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor


note - mask editing tools need continued development, feather option is not working 100%
2012-06-04 16:42:58 +00:00
8ffeca1f60 copy mask file from tomato branch, sorry dont know how to do multiple of these at a time... 2012-06-04 15:44:42 +00:00
0d50a364ed svn merge ^/trunk/blender -r47398:47413 2012-06-04 15:28:38 +00:00
7b8ee67933 split mask add functions into their own file. 2012-06-04 14:27:13 +00:00
7cd7a88740 code cleanup 2012-06-04 13:46:38 +00:00
c357041e0a operator to switch direction 2012-06-04 13:24:10 +00:00