Campbell Barton [Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)]
svn merge ^/trunk/blender -r48638:48658
Campbell Barton [Thu, 5 Jul 2012 18:03:07 +0000 (18:03 +0000)]
code cleanup: use a define for bmesh hull epsilon
Campbell Barton [Thu, 5 Jul 2012 18:02:28 +0000 (18:02 +0000)]
fix for error in own recebt commit, broke mask feathering.
Campbell Barton [Thu, 5 Jul 2012 17:08:06 +0000 (17:08 +0000)]
fix for crash in point comparison when one of the arrays is NULL
Bastien Montagne [Thu, 5 Jul 2012 13:02:42 +0000 (13:02 +0000)]
Cosmetic updates to mesh validate messages.
Campbell Barton [Thu, 5 Jul 2012 12:50:50 +0000 (12:50 +0000)]
fix for making local loosing references to node groups.
node->id was left as an indirect link which wont get saved with the file.
Campbell Barton [Thu, 5 Jul 2012 12:09:43 +0000 (12:09 +0000)]
code cleanup: replace magic numbers with enum.
Thomas Dinges [Thu, 5 Jul 2012 11:45:28 +0000 (11:45 +0000)]
Scons:
Fix for r48639, wrong syntax and wrong indent...
Campbell Barton [Thu, 5 Jul 2012 11:40:48 +0000 (11:40 +0000)]
svn merge ^/trunk/blender -r48604:48638
Antony Riakiotakis [Thu, 5 Jul 2012 11:39:11 +0000 (11:39 +0000)]
Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.
Campbell Barton [Thu, 5 Jul 2012 11:37:04 +0000 (11:37 +0000)]
add the ability to make objects and obdata local but not materials.
Bastien Montagne [Thu, 5 Jul 2012 10:56:58 +0000 (10:56 +0000)]
Japanese and Ukranian are now above 60% done, congrats!
Sergey Sharybin [Thu, 5 Jul 2012 09:41:12 +0000 (09:41 +0000)]
Color management: skip generating byte buffers in verify_buffer_float
This saves some time in cases color management is used by sipping
generating non-color managed buffers.
Sergey Sharybin [Thu, 5 Jul 2012 09:41:07 +0000 (09:41 +0000)]
Color management: remove unused code
Sergey Sharybin [Thu, 5 Jul 2012 09:41:00 +0000 (09:41 +0000)]
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.
Sergey Sharybin [Thu, 5 Jul 2012 09:40:53 +0000 (09:40 +0000)]
Color management: do not initialize threads in case conversion
happens in single thread only.
Jeroen Bakker [Thu, 5 Jul 2012 09:39:06 +0000 (09:39 +0000)]
Added a default margin to the tile dependancy of the lens distortion
node.
Jeroen Bakker [Thu, 5 Jul 2012 08:33:17 +0000 (08:33 +0000)]
Adjusted margin of the lens distortion
Jeroen Bakker [Thu, 5 Jul 2012 06:34:31 +0000 (06:34 +0000)]
Moved highlight code to the workscheduler.
Nicholas Rishel [Thu, 5 Jul 2012 04:47:47 +0000 (04:47 +0000)]
Doxygen cleanup
Nicholas Bishop [Thu, 5 Jul 2012 03:55:55 +0000 (03:55 +0000)]
Code cleanup: move PBVH ray/AABB intersection test to BLI_math_geom
Sergej Reich [Thu, 5 Jul 2012 02:58:02 +0000 (02:58 +0000)]
Draw outdated point cache in a lighter color
Thomas Dinges [Wed, 4 Jul 2012 23:00:49 +0000 (23:00 +0000)]
Fix for [#32016] Tracking Settings Presets not working
* Removed outdated properties from the presets.
Note: it does not fail anymore, but needs an update for new settings probably.
Antony Riakiotakis [Wed, 4 Jul 2012 22:55:40 +0000 (22:55 +0000)]
Change order of inclusion to stop MinGW from complaining
Campbell Barton [Wed, 4 Jul 2012 21:41:05 +0000 (21:41 +0000)]
style cleanup
Campbell Barton [Wed, 4 Jul 2012 20:47:12 +0000 (20:47 +0000)]
style cleanup
Campbell Barton [Wed, 4 Jul 2012 20:13:39 +0000 (20:13 +0000)]
code cleanup: remove Python.h include from blenkernel.
Campbell Barton [Wed, 4 Jul 2012 18:49:09 +0000 (18:49 +0000)]
fix for crash with zero area mask.
Campbell Barton [Wed, 4 Jul 2012 18:40:19 +0000 (18:40 +0000)]
style cleanup
Bastien Montagne [Wed, 4 Jul 2012 18:19:58 +0000 (18:19 +0000)]
Minor update to make it work within i18n repo too.
Campbell Barton [Wed, 4 Jul 2012 17:55:30 +0000 (17:55 +0000)]
svn merge ^/trunk/blender -r48585:48604
Daniel Genrich [Wed, 4 Jul 2012 16:55:17 +0000 (16:55 +0000)]
Bugfix Smoke / DynamicPaint: Missing update call from depsgraph was missing when force fields were used.
Thomas Dinges [Wed, 4 Jul 2012 16:39:34 +0000 (16:39 +0000)]
Cmake / Boost:
* Code cleanup
Alexander Pinzon [Wed, 4 Jul 2012 16:10:22 +0000 (16:10 +0000)]
Windows (msvc 2010) is now using Boost 1.49 - Updated cmake file.
Campbell Barton [Wed, 4 Jul 2012 16:07:01 +0000 (16:07 +0000)]
fix for carve memory leak, update carve to hg
bf36d92ff093
reported: http://code.google.com/p/carve/issues/detail?id=33
Bastien Montagne [Wed, 4 Jul 2012 15:52:07 +0000 (15:52 +0000)]
Last spell checking (for now).
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
Bastien Montagne [Wed, 4 Jul 2012 15:04:38 +0000 (15:04 +0000)]
More spell checking.
Campbell Barton [Wed, 4 Jul 2012 12:56:58 +0000 (12:56 +0000)]
spelling cleanup: metre -> er
Campbell Barton [Wed, 4 Jul 2012 12:36:43 +0000 (12:36 +0000)]
fix for building with windows.
Jeroen Bakker [Wed, 4 Jul 2012 12:30:17 +0000 (12:30 +0000)]
relay the original node to a different place holder to resolve some
crashes.
Bastien Montagne [Wed, 4 Jul 2012 12:19:50 +0000 (12:19 +0000)]
Spellfixes: colour -> color
Campbell Barton [Wed, 4 Jul 2012 11:53:48 +0000 (11:53 +0000)]
svn merge ^/trunk/blender -r48576:48585
Campbell Barton [Wed, 4 Jul 2012 11:48:42 +0000 (11:48 +0000)]
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).
Jeroen Bakker [Wed, 4 Jul 2012 11:39:28 +0000 (11:39 +0000)]
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.
Jeroen Bakker [Wed, 4 Jul 2012 10:01:45 +0000 (10:01 +0000)]
Highlight nodes that are being processed
Sergey Sharybin [Wed, 4 Jul 2012 09:08:05 +0000 (09:08 +0000)]
Style cleanup, no functional changes
Jens Verwiebe [Wed, 4 Jul 2012 08:39:57 +0000 (08:39 +0000)]
fix staic OCIO with cmake and a little correction in scons)
Sergey Sharybin [Wed, 4 Jul 2012 07:37:21 +0000 (07:37 +0000)]
Merging r48575 through r48576 from trunk into soc-2011-tomato
Bastien Montagne [Wed, 4 Jul 2012 07:35:54 +0000 (07:35 +0000)]
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.
Sergey Sharybin [Wed, 4 Jul 2012 07:33:34 +0000 (07:33 +0000)]
Merging r48545 through r48574 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 4 Jul 2012 07:10:23 +0000 (07:10 +0000)]
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.
Campbell Barton [Tue, 3 Jul 2012 22:58:43 +0000 (22:58 +0000)]
add support for scrubbing with the mouse
Campbell Barton [Tue, 3 Jul 2012 22:10:59 +0000 (22:10 +0000)]
most keyboard events working again, but no scrub
Campbell Barton [Tue, 3 Jul 2012 21:03:39 +0000 (21:03 +0000)]
fix error in node template and quiet warning.
Jens Verwiebe [Tue, 3 Jul 2012 19:40:01 +0000 (19:40 +0000)]
make the last fix unhackish
Bastien Montagne [Tue, 3 Jul 2012 19:09:07 +0000 (19:09 +0000)]
More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).
Bastien Montagne [Tue, 3 Jul 2012 19:06:43 +0000 (19:06 +0000)]
Minor updates.
Jens Verwiebe [Tue, 3 Jul 2012 19:03:52 +0000 (19:03 +0000)]
some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs
Bastien Montagne [Tue, 3 Jul 2012 17:20:21 +0000 (17:20 +0000)]
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
Sergey Sharybin [Tue, 3 Jul 2012 16:23:15 +0000 (16:23 +0000)]
Tomato: skip cache for Movieclip input node only when rendering
Sergey Sharybin [Tue, 3 Jul 2012 16:18:39 +0000 (16:18 +0000)]
Tomato experimental option: disable cacheing for movie clip node
Sergey Sharybin [Tue, 3 Jul 2012 16:04:26 +0000 (16:04 +0000)]
Also fix Anim Player button for node editor
Sergey Sharybin [Tue, 3 Jul 2012 16:00:57 +0000 (16:00 +0000)]
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.
Sergey Sharybin [Tue, 3 Jul 2012 15:46:23 +0000 (15:46 +0000)]
Tomato: correction to mask cache so parenting should work fine now
Sergey Sharybin [Tue, 3 Jul 2012 15:14:14 +0000 (15:14 +0000)]
Merging r48538 through r48544 from trunk into soc-2011-tomato
Bastien Montagne [Tue, 3 Jul 2012 15:05:10 +0000 (15:05 +0000)]
Grmph! module renaming broke the tool!
Sergey Sharybin [Tue, 3 Jul 2012 15:01:54 +0000 (15:01 +0000)]
Fix #32002: "Anim Player" button on header doesn't appear
Sergey Sharybin [Tue, 3 Jul 2012 14:51:54 +0000 (14:51 +0000)]
Corrections to default values for view settings
Sergey Sharybin [Tue, 3 Jul 2012 14:30:55 +0000 (14:30 +0000)]
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.
Campbell Barton [Tue, 3 Jul 2012 14:25:06 +0000 (14:25 +0000)]
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.
Campbell Barton [Tue, 3 Jul 2012 14:05:18 +0000 (14:05 +0000)]
svn merge ^/trunk/blender -r48527:48537
Campbell Barton [Tue, 3 Jul 2012 14:04:39 +0000 (14:04 +0000)]
dont display image sequences outside the frame range in the 3D viewport.
Joshua Leung [Tue, 3 Jul 2012 13:47:13 +0000 (13:47 +0000)]
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)
Bastien Montagne [Tue, 3 Jul 2012 13:24:13 +0000 (13:24 +0000)]
More exception words to the ui dico... :/
Bastien Montagne [Tue, 3 Jul 2012 13:15:23 +0000 (13:15 +0000)]
Minor edits.
Bastien Montagne [Tue, 3 Jul 2012 12:40:19 +0000 (12:40 +0000)]
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!
Campbell Barton [Tue, 3 Jul 2012 11:32:42 +0000 (11:32 +0000)]
rename module to something less generic.
Campbell Barton [Tue, 3 Jul 2012 11:03:39 +0000 (11:03 +0000)]
svn merge ^/trunk/blender -r48489:48527
Sergey Sharybin [Tue, 3 Jul 2012 10:56:48 +0000 (10:56 +0000)]
Tomato: style cleanup, no functional changes
Sergey Sharybin [Tue, 3 Jul 2012 10:56:33 +0000 (10:56 +0000)]
Tomato: improved cache management for movie clips
Replace pseudo-LRU approach of determining which buffer
to remove when running out of space allowed for cache
with approach which would remove the frame which is most
far away from newly added frame.
This is still a bit tricky because it's impossible to
distinguish which frame to delete in situation of:
CCCC...CC
^
it's either user wants to extend left segment of cached
frames and buffers from right segment should be removed
or he wants to join this two segments and in that case
buffers from right segment should be removed.
Would need a bit more investigation which situation
is more common in general usecase.
Campbell Barton [Tue, 3 Jul 2012 10:32:10 +0000 (10:32 +0000)]
fix (actually nasty workaround), for groups incorrectly drawing in the object panel when the blend file has naming collisions with library data.
also minor style cleanup in bpy_rna.c
Jeroen Bakker [Tue, 3 Jul 2012 09:05:19 +0000 (09:05 +0000)]
Optimized the area of interest of the lensdistortion node.
This will have faster feedback to the user, as lensdistortion is mostly
a node that is located at the end of a composite
Bastien Montagne [Tue, 3 Jul 2012 09:02:41 +0000 (09:02 +0000)]
Style edit (mostly), use """ for docstrings (not ''').
Should also fix the broken py ops tips...
Jeroen Bakker [Tue, 3 Jul 2012 08:54:07 +0000 (08:54 +0000)]
Check for nullpointers.
The ID of group nodes are not always filled.
Campbell Barton [Tue, 3 Jul 2012 08:16:14 +0000 (08:16 +0000)]
fix for memory leak in BKE_mesh_ensure_navmesh(), it would add 2 navmesh layers, once referencing the other.
Campbell Barton [Tue, 3 Jul 2012 06:45:43 +0000 (06:45 +0000)]
fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading.
Joshua Leung [Tue, 3 Jul 2012 05:46:44 +0000 (05:46 +0000)]
Bugfix: Fix crashes with empty material slots
Joshua Leung [Tue, 3 Jul 2012 05:30:19 +0000 (05:30 +0000)]
Followup for r.48515
* Removed material driver creation hack. However, the textures one remains, as
texture eval isn't ready yet
* Shuffled some code
Joshua Leung [Tue, 3 Jul 2012 05:11:37 +0000 (05:11 +0000)]
Bugfix [#31834] Cycles materials cannot be manipulated using drivers
Until now, there was never any code for making drivers on materials get
recalculated when their dependencies were changed. However, since changing
material colors with drivers is something that is quite common, a workaround was
introduced to ensure that materials could still be driven (albeit with the
relevant drivers rooted at object level). This worked well enough so far with
traditional materials - though it was sometimes clunky and confusing for some
users - and would have been ok to tide us over until the depsgraph refactor.
The introduction of Cycles changed this, as it has in many other ways. Now that
people use Cycles to render, they'll need to drive the material colors through
the nested nodetree (and other things nested deeply within that). However, this
is much more difficult to generate hacks to create the relevant paths needed to
work around the problem.
== This Commit... ==
* Adds a recursive driver calculation step to the BKE_object_handle_update()
(which gets called whenever the depsgraph has finished tagging object datablocks
for updates), which goes through calculating the drivers attached to the object
(and the materials/nodetrees attached to that). This case gets handled everytime
the object is tagged as needing updates to its "data" (OB_RECALC_DATA)
* When building the depsgraph, every dependency that the drivers there have are
treated as if they were attached to object.data instead. This should trick the
depsgraph into tagging OB_RECALC_DATA to force recalculation of drivers, at the
expense perhaps of modifiers getting recalculated again.
== Todo ==
* The old workarounds noted are still in place (will be commented out in the
next commit). This fix renders at least the material case redundant, although
the textures case still needs a bit more work.
* Check on whether similar hacks can be done for other datablock combinations
* So far, only simple test cases have been tested. There is probably some
performance penalty for heavy setups still (due to need to traverse down all
parts of material/node hierarchy to find things that need updates). If there
really is a problem here, we could try introducing some tags to limit this
traversal (which get added at depsgraph build time). <--- USER TESTING
NEEDED!!!
Joshua Leung [Tue, 3 Jul 2012 01:15:03 +0000 (01:15 +0000)]
Bugfix [#31976] Bone Group Custom color set is not respected when creating an
Action
Custom color set colors were not getting copied over when creating new action
groups. Instead, a "default set" was initialised for use instead.
Bastien Montagne [Tue, 3 Jul 2012 01:11:59 +0000 (01:11 +0000)]
Nice update to xgettext replacement, now finds 608 strings, think this covers all cases...
Will run a complete test case tomorrow, regexes killed me this evening!
Campbell Barton [Mon, 2 Jul 2012 23:01:04 +0000 (23:01 +0000)]
basic events quit and resize window now work
text draws again.
Sergey Sharybin [Mon, 2 Jul 2012 20:38:57 +0000 (20:38 +0000)]
Tomato: enable color management by default for Windows
This commit enables color management stuff when building on
Windows using MSVC 2008 compiler. This required some fixes
to both CMake and SCons configurations which were tested for
64bit target. Tests of 32bit target would be welcome.
Also solved compilation error caused by recently added anim
player. Not sure how to test this, but it shall at least
compile on Windows now.
Didn't test MinGW compilation at all yet, could still be buggy.
Campbell Barton [Mon, 2 Jul 2012 20:28:43 +0000 (20:28 +0000)]
add bmesh/python operator support for vector and matrix args.
also rename BMO_OP_SLOT_PNT to BMO_OP_SLOT_PTR (matches RNA and sounds less like 'point')
Bastien Montagne [Mon, 2 Jul 2012 19:51:06 +0000 (19:51 +0000)]
Adding (moving from bf-translation) the i18n python module. This will make it available for future "UI Translation" addon, and probably other UI-related tools as well.
Notes:
* This is a somewhat reworked version of what is currently in bf-translation's trunk/po/tools, not yet fully functionnal (well, 95% is ;) ) nor fully tested. ultimately, it will replace it (being "svn-linked" in bf-translation).
* Added feature: more complete/strict tests (yet some work to be done here).
* Added spell checking (huge spellcheck commit incomming...).
* Trying to get rid of xgettext itself (should e.g. allow us to use #defines as contexts, among other things...). But currently captures less strings, work needed here too.
Please note this includes libfribidi.dll, as it is hard to find it for windows (unixes should have no problems here).
Campbell Barton [Mon, 2 Jul 2012 17:15:48 +0000 (17:15 +0000)]
enable playing with blenders internal anim player again.
Campbell Barton [Mon, 2 Jul 2012 17:12:41 +0000 (17:12 +0000)]
fix for crash getting GROUP_OT_objects_remove's props without a context (own fault)
Sergey Sharybin [Mon, 2 Jul 2012 16:38:06 +0000 (16:38 +0000)]
Color management: added support of color applying color transform on save
This applies to files when saving from image editor and when saving
render result.
Currently only works for images which has got float buffer and saving
happens to byte formats (such as PNG, JPEG). Also supports applying
color management for preview jpegs when main buffer is saving into
OpenEXR file.
As default transform when saving from image editor would be the same
settings as image editor uses itself.
Defaults for color correction of rendered images would be default
display name, no view transform and default values for gamma and
exposure.
Sergey Sharybin [Mon, 2 Jul 2012 16:37:40 +0000 (16:37 +0000)]
Color management refactor
- Move color management display settings into own structure like it's
done for view settings.
This is helpful from two sides:
* It is planned to support display calibration settings which
should be taken into account by color management stuff to
add needed transformations to OCIO processor.
* File saving should be able to make the same display
transformations as it's done by window when displaying the image.
Having own DNA and RNA structures for display device settings
helps avoiding having duplicated code.
- Small refactor of cacheing functions which are now accepts
cache-like versions of view and display settings. This structures
used for cache are quite the same as DNA structures but they contains
indices of view and display which avoids extra lookup for this
things.
This also helps having reasonable amount of variables passing
to cache functions.
Lukas Toenne [Mon, 2 Jul 2012 16:27:09 +0000 (16:27 +0000)]
Fix for image texture node in cycles. The button draw function has to use the image user pointer directly for property buttons, unlike the compositor image node which redefines image user properties on the node itself to ensure proper updates.