Commit Graph

8122 Commits

Author SHA1 Message Date
Sergey Sharybin
2e30bf28c1 Merging r49711 through r49737 from trunk into soc-2011-tomato 2012-08-09 17:03:33 +00:00
Sergey Sharybin
9f30c7147c Frame matching methods for follow track constraint
This is needed in cases when using blender camera with different
resolution than original footage. Behaves in the same way as
background picture framing.
2012-08-09 16:57:02 +00:00
Campbell Barton
2f2560eb49 use sensor size when calculating dof rather then hard coded values. 2012-08-09 15:59:32 +00:00
Daniel Genrich
863aee6caf Bugfix/Enhancement: Cloth didn't support animated vertex groups like the "Vertex Weight" modifier.
Regression blend file: http://wiki.blender.org/uploads/b/b8/Cloth_anim_vertex.blend

Thanks to Kologe for reporting this problem and also providing the regression blend file.
2012-08-09 13:33:27 +00:00
Campbell Barton
0107385f7f code cleanup: ensure macros require ';' endings 2012-08-08 21:20:10 +00:00
Campbell Barton
f0951f58ca code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering 2012-08-08 18:37:06 +00:00
Campbell Barton
0b5a995cfd code cleanup: rename G.rt to G.debug_value 2012-08-08 18:21:54 +00:00
Sergey Sharybin
5ad7ab03e3 Merging r49681 through r49707 from trunk into soc-2011-tomato 2012-08-08 16:48:05 +00:00
Sergey Sharybin
748228d223 Sequencer: corrections to sequence cache invalidation 2012-08-08 16:46:47 +00:00
Sergey Sharybin
7483429e62 Sequencer: initial implementation of multithreaded effects
Added a framework to run effects in several threads. Port most
of effects to this new framework.

Still some work to be done here (some effects are not so easy to port)
2012-08-08 16:46:45 +00:00
Sergey Sharybin
ac2b6e23eb Code cleanup: use defines instead of magic constants 2012-08-08 16:46:44 +00:00
Sergey Sharybin
e4b494ac3b Sequencer: do not invalidate sequences which are not blending with bottom machines 2012-08-08 16:46:43 +00:00
Sergey Sharybin
af81d7a4f1 Style cleanup: whitespace 2012-08-08 16:46:42 +00:00
Sergey Sharybin
a0a67d2984 Sequencer: initial support of refreshing only changed sequences
Before this the the whole sequencer cache would be invalidated
when hanging sequence settings.

This was completely annoying because changing color balance
settings would re-load image file for which color balance
is happening on every change,

In fact it's still an issue if color balance is changing for
image strip itself, but if this strip has got effect and
color balance is changing for it file wouldn't be reloaded.
2012-08-08 16:46:40 +00:00
Sergey Sharybin
572c82e74e Code cleanup: make some more functions more meaningful name 2012-08-08 11:56:58 +00:00
Sergey Sharybin
2fe1f37d3a Style cleanup 2012-08-08 11:52:14 +00:00
Sergey Sharybin
1bf893e9c8 Code cleanup: BKE_ prefix for public sequencer functions 2012-08-08 11:15:40 +00:00
Sergey Sharybin
03a3e4f165 Code cleanup: remove redundant struct and some space cleanup 2012-08-08 11:15:38 +00:00
Sergey Sharybin
2457e89481 Code cleanup: remove unused functions
The code would be in SVN anyway and having bunch of unused code
doesn't seems to be logical.
2012-08-08 11:15:36 +00:00
Sergey Sharybin
0b31218c85 Style cleanup: white space 2012-08-08 11:15:36 +00:00
Sergey Sharybin
1cdc39f49b Code cleanup: mark functions as static, ifdef 0 some unused functions 2012-08-08 11:15:32 +00:00
Mitchell Stokes
47c7266522 Accidentally did a commit when I wanted to revert... (ignore my last revision) 2012-08-08 01:29:20 +00:00
Mitchell Stokes
843b45cafa 2012-08-08 01:24:48 +00:00
Sergey Sharybin
93b823784d Merging r49659 through r49666 from trunk into soc-2011-tomato 2012-08-07 16:48:43 +00:00
Sergey Sharybin
6cf1a9834b Made image buffer threaded processor generic function,
so color management could use the same routines.

Should be no functional changes.
2012-08-07 16:47:46 +00:00
Sergey Sharybin
95465e7a28 Made color balance in sequencer multi-threaded
Should give some more realtime update, but it's currently not the
biggest issue - changing color balance settings would imply reloading
of file which is slow. Would be investigated further.

This change shouldn't affect on pre-fetching job which is already
multi-threaded and doing threaded color balance would make things
only worse.
2012-08-07 16:09:42 +00:00
Campbell Barton
9ad19c26ca svn merge ^/trunk/blender -r49644:49653 2012-08-07 13:38:35 +00:00
Lukas Toenne
9388d04911 Fix for particle influence textures. These now work with "Particle/Strand" input coordinates, mapping the relative particle index into the [-1, 1] Y-coordinate range. 2012-08-07 10:54:50 +00:00
Campbell Barton
62c8772a91 svn merge ^/trunk/blender -r49628:49634 2012-08-06 19:37:35 +00:00
Lukas Toenne
f961afece0 Fix for incomplete Reroute node updates. Adding reroute nodes by spliting links would often result in unrelated color sockets or otherwise miss updates.
The reason is that the per-node updates used for Reroute node type inheritance are not supposed to be looking at connected nodes, they are purely for "local" updates. For this sort of "global" update which requires depth-first search, the update function on the node tree level must be used instead.
2012-08-06 18:49:28 +00:00
Sergey Sharybin
24fc0287f3 Merging r49622 through r49623 from trunk into soc-2011-tomato 2012-08-06 15:22:19 +00:00
Sergey Sharybin
a334b5a4b6 Made feather self-intersection check an option.
Useful in cases when masking stuff like self-intersecting
ropes. This could probably be smarter option, but can't
currently think about robust approach here.
2012-08-06 15:20:14 +00:00
Campbell Barton
e2203d548e svn merge ^/trunk/blender -r49601:49620 2012-08-06 14:02:03 +00:00
Campbell Barton
385c38f6ed misc small edits syncing with trunk 2012-08-06 13:59:11 +00:00
Sergey Sharybin
b282b5275c Mask feather self-intersection check
Enable self-intersection check for preview. In own tests average
time for this operation on mango files was ~0.0015sec, and it was
like 20 splines max which still gives pretty smooth performance
on my core quad machine.

Would think let's check how it works for now, if it'll give some
issues here, would just avoid tessellation on every redraw by
storing tessellation in some cache (probably in mask user).

Another change is related on a way which loop to collapse.
Changed length check with AABB size check. A bit slower but
should be a bit more predictable.
2012-08-06 13:53:38 +00:00
Campbell Barton
2b8ac9bc61 inpaint node from tomato branch by Peter Schlaile
http://en.wikipedia.org/wiki/Inpainting
2012-08-06 13:45:11 +00:00
Campbell Barton
7beb47bd69 fix for freeing NULL pointer. 2012-08-06 13:04:40 +00:00
Campbell Barton
4e2fb45576 style cleanup 2012-08-06 10:03:17 +00:00
Campbell Barton
77610e1550 svn merge ^/trunk/blender -r49573:49601 2012-08-06 09:33:43 +00:00
Campbell Barton
df81b50bf2 prevent copy/paste from incompatible types (compo -> material for eg) - would crash instantly. 2012-08-06 08:41:45 +00:00
Campbell Barton
5bb97305a4 fix for node clipboard leak on exit, also use blenders convention for function naming with BKE clipboard funcs. 2012-08-06 08:25:24 +00:00
Campbell Barton
e592f757e8 fix for crash when moving frames about in the node space, was possible to move a node into its own child frame (causing recursive parent loop).
also some minor code cleanup.
2012-08-05 20:40:26 +00:00
Campbell Barton
0a35e050f3 code cleanup: remove redundant calls to CTX_data_main() 2012-08-05 14:11:51 +00:00
Campbell Barton
9ddbd8329e fix uninitialized memory use for mask feather points, also remove some double promotions. 2012-08-05 13:26:39 +00:00
Sergey Sharybin
cae3dbd141 Merging r49534 through r49573 from trunk into soc-2011-tomato 2012-08-05 12:54:39 +00:00
Campbell Barton
2044b62370 resolve some issues with curve resolution calculaction
- resolution could become so high that it would wrap around  to a negative number, now check for small numbers before doing float division.
- resolution was being calculated in some cases when it already met the clamp value - now this is skipped.
2012-08-04 20:17:22 +00:00
Campbell Barton
3d20474414 style cleanup 2012-08-04 19:34:38 +00:00
Campbell Barton
9ff4fa6671 style cleanup 2012-08-04 12:30:16 +00:00
Campbell Barton
96bda09d23 code cleanup: use camelcase for struct name. 2012-08-03 23:44:50 +00:00
Campbell Barton
6972e19fd5 code cleanup:
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0)  with  (BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.
2012-08-03 22:12:57 +00:00