Commit Graph

39855 Commits

Author SHA1 Message Date
Sergey Sharybin
83758c4154 Color management: refactor of cache to deal better with movie clip cache
There were some crashes discovered in some circumstances of using
color management within the clip editor which ended up some refactoring
of color management cache.

Switch from global movie cache instance to per-image buffer instances

This only means keys for color managed buffers could be much simpier
and that look up would happen much faster in there're lots of frames
cached. Memory limiter stuff is still global for all color management
and in fact it's also shared with movie clip cache .

This allowed to get rid of original image buffer stored in cache
key and allowed to easily remove all display buffers when source
image buffer is being freed. This was main culptrit leading to
crashes.

Additional changes:

- Add option to make moviecache verbose. If DEBUG_MESSAGES is
  defined in moviecache.c detailed logs would be printed to the
  console.

- Movie caches are now named which helps reading debug messages.

- Improved a bit behavior of cache element removing when buffer
  overflows on adding new display buffer and there're frames from
  movie clip.
2012-07-05 09:41:00 +00:00
Sergey Sharybin
60113a4b63 Color management: do not initialize threads in case conversion
happens in single thread only.
2012-07-05 09:40:53 +00:00
Campbell Barton
48d0d32f73 svn merge ^/trunk/blender -r48585:48604 2012-07-04 17:55:30 +00:00
Daniel Genrich
958cf139f6 Bugfix Smoke / DynamicPaint: Missing update call from depsgraph was missing when force fields were used. 2012-07-04 16:55:17 +00:00
Thomas Dinges
6829f613c2 Cmake / Boost:
* Code cleanup
2012-07-04 16:39:34 +00:00
Alexander Pinzon
04343ecd8c Windows (msvc 2010) is now using Boost 1.49 - Updated cmake file. 2012-07-04 16:10:22 +00:00
Campbell Barton
7180551890 fix for carve memory leak, update carve to hg bf36d92ff093
reported: http://code.google.com/p/carve/issues/detail?id=33
2012-07-04 16:07:01 +00:00
Bastien Montagne
4149ea5f50 Last spell checking (for now).
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
2012-07-04 15:52:07 +00:00
Bastien Montagne
558721ab59 More spell checking. 2012-07-04 15:04:38 +00:00
Campbell Barton
715edceb42 spelling cleanup: metre -> er 2012-07-04 12:56:58 +00:00
Campbell Barton
438b77e5d4 fix for building with windows. 2012-07-04 12:36:43 +00:00
Jeroen Bakker
7cde835c2e relay the original node to a different place holder to resolve some
crashes.
2012-07-04 12:30:17 +00:00
Bastien Montagne
4d2a6a8e21 Spellfixes: colour -> color 2012-07-04 12:19:50 +00:00
Campbell Barton
fbc24a61c4 svn merge ^/trunk/blender -r48576:48585 2012-07-04 11:53:48 +00:00
Campbell Barton
16e6b7b867 cycles changes:
- images that can't be loaded because of the limit are printed in the console.
- textures that can't be found show up as pink (so we know somethings wrong).
2012-07-04 11:48:42 +00:00
Jeroen Bakker
778999cbbf Two pass execution:
1. first pass only fast nodes are calculated and only to the active
viewer node
2. second pass all nodes to all outputs

Temp disabled highlights because of random crashes.
2012-07-04 11:39:28 +00:00
Jeroen Bakker
33e12a2983 Highlight nodes that are being processed 2012-07-04 10:01:45 +00:00
Sergey Sharybin
e34f28f81c Style cleanup, no functional changes 2012-07-04 09:08:05 +00:00
Jens Verwiebe
be1f396cb9 fix staic OCIO with cmake and a little correction in scons) 2012-07-04 08:39:57 +00:00
Sergey Sharybin
ebdd2201ff Merging r48575 through r48576 from trunk into soc-2011-tomato 2012-07-04 07:37:21 +00:00
Bastien Montagne
592196cb70 Revert the DNA pdef_stickness -> pdef_stickiness part of r48556.
Forgot DNA needed stable names... :/ Correct spelling would involve keeping the old one for load code anyway, so better live with incorrect spelling here.
2012-07-04 07:35:54 +00:00
Sergey Sharybin
17d7a9c3d9 Merging r48545 through r48574 from trunk into soc-2011-tomato 2012-07-04 07:33:34 +00:00
Sergey Sharybin
facc2429ab Mask node: create a copy of layers to be rasterized in initExecution
This creates a list of splines to be rasterized in nitExecution which
is being called from main thread. This should resolve possible threading
issues discovered in tomato branch.
2012-07-04 07:10:23 +00:00
Campbell Barton
e505ab8ad2 add support for scrubbing with the mouse 2012-07-03 22:58:43 +00:00
Campbell Barton
c1493432a3 most keyboard events working again, but no scrub 2012-07-03 22:10:59 +00:00
Campbell Barton
81a509fa40 fix error in node template and quiet warning. 2012-07-03 21:03:39 +00:00
Jens Verwiebe
223cdefbf5 make the last fix unhackish 2012-07-03 19:40:01 +00:00
Bastien Montagne
468ef74ed7 More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize). 2012-07-03 19:09:07 +00:00
Bastien Montagne
14b2c348c8 Minor updates. 2012-07-03 19:06:43 +00:00
Jens Verwiebe
d8f9a2c45f some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs 2012-07-03 19:03:52 +00:00
Bastien Montagne
37dc4006c7 First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names). 2012-07-03 17:20:21 +00:00
Sergey Sharybin
9ac9040cfd Tomato: skip cache for Movieclip input node only when rendering 2012-07-03 16:23:15 +00:00
Sergey Sharybin
f56f492c5a Tomato experimental option: disable cacheing for movie clip node 2012-07-03 16:18:39 +00:00
Sergey Sharybin
bc78942be0 Also fix Anim Player button for node editor 2012-07-03 16:04:26 +00:00
Sergey Sharybin
1b556dcb51 Tomato: fixed crash caused by interaction between color management and
movie clip caches resulting in some unchecked NULL pointers.

Probably it'll be better to separate memory limitors for cache and
clips or double-check priority functions are fine to deal with
such cases.
2012-07-03 16:00:57 +00:00
Sergey Sharybin
89af953a65 Tomato: correction to mask cache so parenting should work fine now 2012-07-03 15:46:23 +00:00
Sergey Sharybin
62541003bf Merging r48538 through r48544 from trunk into soc-2011-tomato 2012-07-03 15:14:14 +00:00
Bastien Montagne
8d4f9f9390 Grmph! module renaming broke the tool! 2012-07-03 15:05:10 +00:00
Sergey Sharybin
06b797033a Fix #32002: "Anim Player" button on header doesn't appear 2012-07-03 15:01:54 +00:00
Sergey Sharybin
3f91437329 Corrections to default values for view settings 2012-07-03 14:51:54 +00:00
Sergey Sharybin
d51297421d Tomato: hack to cache result of rasterization
It shall be removed as soon as tile-based rasterization is here,
but to remove current stoppers should be fine.
2012-07-03 14:30:55 +00:00
Campbell Barton
2e3c474b2d image sequence - apply cyclic option AFTER the image offset,
there was no way to properly loop on a sequence of images that didnt start frame 1.
2012-07-03 14:25:06 +00:00
Campbell Barton
1fb0ecb9bb svn merge ^/trunk/blender -r48527:48537 2012-07-03 14:05:18 +00:00
Campbell Barton
42aaa47e9b dont display image sequences outside the frame range in the 3D viewport. 2012-07-03 14:04:39 +00:00
Joshua Leung
44ca0a4328 Fix for the "black F-Curves" bug on undo
(From personal stash of bugs - since early 2.5 versions)

F-Curve colors get applied only on Graph Editor "refresh()". In some cases, undo
was reverting back to a state where the colors had not yet been set. In these
cases, there would be no refresh() after that undo (until expanding a channel or
some other similar action), resulting in "black F-Curves" appearing. So, now we
force such an update after undo to ensure that the curves never display black.

(Noticed while investigating another bug for Mango related to
CLIP_OT_constraint_to_fcurve not sending notifiers required when new F-Curves
are added)
2012-07-03 13:47:13 +00:00
Bastien Montagne
69ca014d50 More exception words to the ui dico... :/ 2012-07-03 13:24:13 +00:00
Bastien Montagne
1f81930ad8 Minor edits. 2012-07-03 13:15:23 +00:00
Bastien Montagne
971ffd8fad Fix [#31977] Export Animated Mesh, terminate baking in fluid-sim
* Elbeem exporter code now overrides user settings to No Slip in case the object is animated;
* UI of fluid obstacles now disables slip settings when export animated is enabled;
* Added in this later option's tooltip a mention that it enforces No Slip!
2012-07-03 12:40:19 +00:00
Campbell Barton
f42d606789 rename module to something less generic. 2012-07-03 11:32:42 +00:00
Campbell Barton
259e78997a svn merge ^/trunk/blender -r48489:48527 2012-07-03 11:03:39 +00:00