Campbell Barton
f5fe447e00
svn merge ^/trunk/blender -r48638:48658
2012-07-05 18:04:17 +00:00
Campbell Barton
5f3bd06f37
code cleanup: use a define for bmesh hull epsilon
2012-07-05 18:03:07 +00:00
Campbell Barton
e5cbfb5460
fix for crash in point comparison when one of the arrays is NULL
2012-07-05 17:08:06 +00:00
Bastien Montagne
b0598a203c
Cosmetic updates to mesh validate messages.
2012-07-05 13:02:42 +00:00
Campbell Barton
b5135a8bdf
fix for making local loosing references to node groups.
...
node->id was left as an indirect link which wont get saved with the file.
2012-07-05 12:50:50 +00:00
Campbell Barton
9208aa5792
code cleanup: replace magic numbers with enum.
2012-07-05 12:09:43 +00:00
Campbell Barton
3c367f924a
svn merge ^/trunk/blender -r48604:48638
2012-07-05 11:40:48 +00:00
Antony Riakiotakis
fa92f2fb55
Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.
2012-07-05 11:39:11 +00:00
Campbell Barton
2442bcf807
add the ability to make objects and obdata local but not materials.
2012-07-05 11:37:04 +00:00
Bastien Montagne
e62ec9261c
Japanese and Ukranian are now above 60% done, congrats!
2012-07-05 10:56:58 +00:00
Sergey Sharybin
2e12919c4b
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.
2012-07-05 09:41:12 +00:00
Sergey Sharybin
8b1f1be3ae
Color management: remove unused code
2012-07-05 09:41:07 +00:00
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
Jeroen Bakker
e5e1d7bc9f
Added a default margin to the tile dependancy of the lens distortion
...
node.
2012-07-05 09:39:06 +00:00
Jeroen Bakker
5e0f7467e9
Adjusted margin of the lens distortion
2012-07-05 08:33:17 +00:00
Jeroen Bakker
4e836ab476
Moved highlight code to the workscheduler.
2012-07-05 06:34:31 +00:00
Nicholas Bishop
0085c7110b
Code cleanup: move PBVH ray/AABB intersection test to BLI_math_geom
2012-07-05 03:55:55 +00:00
Sergej Reich
2d5b9c4ae4
Draw outdated point cache in a lighter color
2012-07-05 02:58:02 +00:00
Antony Riakiotakis
3818a47e4a
Change order of inclusion to stop MinGW from complaining
2012-07-04 22:55:40 +00:00
Campbell Barton
9f22750422
style cleanup
2012-07-04 20:47:12 +00:00
Campbell Barton
21bf13989f
code cleanup: remove Python.h include from blenkernel.
2012-07-04 20:13:39 +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
Ove Murberg Henriksen
30085e5ea9
response to code review:
...
http://codereview.appspot.com/6301100/diff/1/source/blender/editors/object/object_vgroup.c
2012-07-04 16:30:12 +00:00
Ove Murberg Henriksen
d43e1fa7be
svn merge ^/trunk/blender -r48095:48592
2012-07-04 15:56:42 +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
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
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
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