Commit Graph

8168 Commits

Author SHA1 Message Date
Sergey Sharybin
fb5c39f5c2 Merging r50016 through r50021 from trunk into soc-2011-tomato 2012-08-19 15:44:59 +00:00
Sergey Sharybin
995a19a983 Sequencer: per-sequence modifier stack for color grading
This implements basic color grading modifiers in sequencer, supporting
color balance, RGB curves and HUE corrections.

Implementation is close to object modifiers, some details are there:

http://wiki.blender.org/index.php/User:Nazg-gul/SequencerModifiers

Modifiers supports multi-threaded calculation, masks and instant
parameter changes.

Also added cache for pre-processed image buffers for current frame,
so changing sequence properties does not require rendering of original
sequence (like rendering scene, loading file from disk and so)
2012-08-19 15:41:56 +00:00
Sergey Sharybin
21e403e546 Merging r49953 through r50015 into from trunk into soc-2011-tomato 2012-08-19 13:57:55 +00:00
Nicholas Bishop
12425588f2 Fix simple subsurf on wire edges
Subsurf on wire edges gave smooth results even if set to simple
subdiv. Added a field to the CCG meshIFC to flag simple subdivision,
then when syncing vertices simply skip moving vertices if in
simple-subdiv mode.

This change affects two places, the level-1 build in sync and the
subdivision up to other levels.

Fixes bug [#32268] Simple Subsurf Modifier gives unexpected results on
edges without faces
projects.blender.org/tracker/index.php?func=detail&aid=32268&group_id=9&atid=498
2012-08-18 19:54:21 +00:00
Campbell Barton
e30ed91b90 code cleanup: use BLI math funcs for metaballs, also remove MB_POINT struct and just use float[3] instead. 2012-08-18 19:30:27 +00:00
Campbell Barton
27b4b45543 utility functions: BLI_findptr, BLI_rfindptr --- use for finding an item in a linked list by a pointer. 2012-08-18 16:16:13 +00:00
Campbell Barton
e982e9b04f fix [#32353] 'Focus'(center) applied on a rig should only take visible bones into account 2012-08-18 14:27:48 +00:00
Campbell Barton
9e742ffc2b style cleanup: also correct some doxy comments 2012-08-18 13:07:48 +00:00
Joshua Leung
7e2f557dba Typo fix: BKE_sequwnce_get_by_name -> BKE_sequence_get_by_name 2012-08-18 05:49:55 +00:00
Joshua Leung
246c86c926 Silencing compiler warnings 2012-08-18 04:50:20 +00:00
Joshua Leung
654f6c4c4f Bugfix [#32331] Graph editor zoom to selected includes coordinate origin if more
than one curve is displayed

The range calculation used to use a fixed 0-1 range whenever it couldn't find
any values for a particular F-Curve. However, this was then taken by the
aggregation calculation to be used as just another value, leading to problems if
only vertices of a very high-value curve are selected to be included.

Modified the range calculation to ensure that suitable vertices were found
before trying to take the range values returned.
2012-08-18 04:39:15 +00:00
Joshua Leung
8995554105 Fix for some typos/spelling mistakes 2012-08-18 03:55:19 +00:00
Gaia Clary
0fee1a3c0b Suport function for Collada exporter: after a generated image was stored to disk, the new filetype was not always recognized. 2012-08-17 23:29:39 +00:00
Campbell Barton
e9caa21830 fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs. 2012-08-17 14:43:20 +00:00
Campbell Barton
08f912e6d5 svn merge ^/trunk/blender -r49886:49890 2012-08-14 12:18:58 +00:00
Campbell Barton
34ebdcacfc fix for recent commit - would crash adding materials on an object without any. 2012-08-14 12:17:06 +00:00
Sergey Sharybin
555b6afe20 Color Management: convert strips to float if Make Float is enabled but no other filters used
Makes it possible to have color corrections in preview for strips which are originally bytes.
2012-08-14 11:12:31 +00:00
Campbell Barton
f1537c64a5 svn merge ^/trunk/blender -r49867:49886 2012-08-14 11:07:42 +00:00
Campbell Barton
f2074949e7 code cleanup: reduce calling sqrt() when distances are only calculated for comparison use dist_squared_to_line_segment_v2(). 2012-08-14 08:44:35 +00:00
Campbell Barton
c0539d267d draw ugly red bands on a sequence strip when its data cant be found (mask, clip, scene, sound) 2012-08-13 17:36:29 +00:00
Campbell Barton
be513d1b15 fix for missing NULL checks when sequence-strip pointers become NULL because of problems with library linking. 2012-08-13 17:25:03 +00:00
Campbell Barton
41b0ec6c94 svn merge ^/trunk/blender -r49854:49867 2012-08-13 09:35:11 +00:00
Daniel Genrich
e297e6b64b Bugfix Cloth: Hooks were broken by recent changes.
This makes it looks like if part 1 of the Dynamic Paint regression blend file fails, but actually it's correct.
2012-08-12 22:54:35 +00:00
Campbell Barton
10f631094c fix [#32126] STAMP: Setting a background color causes color flicker
when rendering the sequencer can output float or char buffers which stamp wasn't accounting for.
2012-08-12 22:50:21 +00:00
Campbell Barton
866f986898 fix for stamp text drawing into a color buffer not taking color management into account. 2012-08-12 22:18:20 +00:00
Campbell Barton
cfb160c764 style cleanup 2012-08-12 21:46:35 +00:00
Sergey Sharybin
cacf56c97b Merging r49840 through r49854 from trunk into soc-2011-tomato 2012-08-12 18:39:05 +00:00
Sergey Sharybin
38541284c5 Resolve issues with color balance not updating properly in sequencer
when float images are used.
2012-08-12 18:38:01 +00:00
Sergey Sharybin
667e7ab348 Correction to one of previous commits 2012-08-12 18:24:01 +00:00
Daniel Genrich
94ef519b79 Fix own mistake: Space got stripped before path 2012-08-12 18:01:27 +00:00
Daniel Genrich
f4117f5b72 El Topo: Fix missing includes (Scons + Cmake) 2012-08-12 17:56:52 +00:00
Gaia Clary
3ebbfe2c40 new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42) 2012-08-12 17:12:07 +00:00
Campbell Barton
32254596d4 replace ELEM8(gs, ID_ME, ID_CU, ID_MB, ID_LT, ID_LA, ID_CA, ID_TXT, ID_SPK) with macro: OB_DATA_SUPPORT_ID() 2012-08-12 14:57:19 +00:00
Sergey Sharybin
8d59fa4e40 Merging r49834 through r49839 from trunk into soc-2011-tomato 2012-08-12 13:38:46 +00:00
Sergey Sharybin
82688e61fc Sequencer: free cache used by sequence when removing strip
Before this removing and adding new strip could have been lead
into situations when new sequence would use old cache.
2012-08-12 13:29:57 +00:00
Sergey Sharybin
8aeba8ec8b Merging r49815 through r49833 from trunk into soc-2011-tomato 2012-08-12 10:07:55 +00:00
Sergey Sharybin
0716a85e53 Fix sequencer crash when invalidating strip when there's nothing cached yet 2012-08-12 09:37:51 +00:00
Campbell Barton
b96c622015 style cleanup 2012-08-11 22:12:32 +00:00
Sergey Sharybin
00afee41c8 Merging r49775 through r49807 from trunk into soc-2011-tomato 2012-08-11 14:39:09 +00:00
Sergey Sharybin
a794e19346 Sequencer: support for masked color balance
This implements option which could be used to color balance only
specified area. Currently done by adding Mask input to Adjustment
effect. Affects on color balance and multiply settings.

Supporting masked saturation control is in the list, not supported
in this commit.

Also show value slider in the right of color wheel.
2012-08-11 14:37:58 +00:00
Sergey Sharybin
0682c3f1ae Code cleanup and minor change to CMake's colalda detection to make
it detect directory structure used for libs in our svn (<root>/include/<component>/include)
2012-08-11 10:32:27 +00:00
Campbell Barton
8d641ebf56 svn merge ^/trunk/blender -r49763:49774 2012-08-10 15:45:09 +00:00
Sergey Sharybin
2a1b7f7f8e Fix infinite recursion when using adjustment strip placed to channel 1 2012-08-10 15:30:38 +00:00
Sergey Sharybin
fea0e60227 Fix building with audaspace disabled 2012-08-10 12:56:09 +00:00
Sergey Sharybin
6129a0f97c Merging r49738 through r49757 from trunk into soc-2011-tomato 2012-08-10 08:54:14 +00:00
Daniel Genrich
32a8d7cbdf Bugfix: Cloth did not work with Dynamic Paint.
Fix 1: Pinned vertices were never released when "unpinned" by Dynamic Paint. 

Fix 2: When pinning vertices during simulation, they would get "warped" to their original starting position of frame 1.

Thanks to MiikaH for pointing this out and also for providing the regression blend file: http://wiki.blender.org/uploads/a/ab/Cloth_dynamic_paint.blend
2012-08-10 00:04:15 +00:00
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