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
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
Tamito Kajiyama
44e4c5f831
Merged changes in the trunk up to revision 49797.
2012-08-12 00:09:57 +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
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
Campbell Barton
Sergey Sharybin
Daniel Genrich
Gaia Clary
Tamito Kajiyama