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
Campbell Barton
53333c78ce
use vector for color operation internal storage.
2012-08-14 11: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
9fd6c535ca
fix [ #32324 ] regression: node group with missing ID crashes new tile node system.
...
node groups with no ID now output magenta so it doesnt silently fail.
2012-08-14 11:05:26 +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
8d496b3bf2
fix [ #32315 ] Circle select unreliable when in vertex+edge select mode
...
dist_squared_to_line_segment_v2() was returning the sqrt'd value in some cases.
also use int's for edge_inside_circle() rather then shorts since it was doing int/float/short conversions and we're now using int's for screen vars in more places.
2012-08-14 08:24:49 +00:00
Gaia Clary
b2943dad26
improved wording for tooltip
2012-08-13 20:20:49 +00:00
Mitchell Stokes
36ad4a1364
Fix for [ #32320 ] "Image browser in UV/image Editor makes Blender crash at exit when .dds image is loaded" reported by Christian Monfort (gulbroz), who also provided the patch to fix the problem. The problem was a double free with some dds buffer data.
2012-08-13 20:16:55 +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
7a3b44cf69
style cleanup
2012-08-13 16:03:48 +00:00
Campbell Barton
ca7d1ec39d
style cleanup: use <pre> for doxygen ascii art
2012-08-13 15:17:15 +00:00
Campbell Barton
39945fedf3
minor edits to r49870
2012-08-13 11:01:27 +00:00
Jeroen Bakker
e28fcec042
Fix for [ #32220 ] regression - DistortionCache is never freed.
...
* at max 10 cache items will be available. Items will be removed by
latest usage.
* number of cached items can be adjusted in code
* added deinitialization of compositor when blender exists.
* updated scons and cmake build files
2012-08-13 10:56:36 +00:00
Sergey Sharybin
64e0202314
Sequencer: corrections to default values of some properties
2012-08-13 09:47:45 +00:00
Campbell Barton
41b0ec6c94
svn merge ^/trunk/blender -r49854:49867
2012-08-13 09:35:11 +00:00
Campbell Barton
7d3e854aeb
add hook now has option to add to active bone (mango request).
2012-08-13 08:54:33 +00:00
Campbell Barton
6324c5fed1
code cleanup: includes for imbuf, also remove double promotion.
2012-08-12 23:28:33 +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
Campbell Barton
3c2b4107de
confusion minf/fmin, broke msvc
2012-08-12 19:41:47 +00:00
Campbell Barton
c140ccb9fd
2d smoothview now scales back the time to move for smaller view zoom/panning.
...
also the compositor bounds (used for scroll bars), were only calculated when pressing the home key in 2.63, how this is updated on draw
2012-08-12 19:35:47 +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
Campbell Barton
61eacb534e
inpaint node now blend inpaint pixels with existing alpha, this makes soft alpha blends inpaint look nicer.
...
also dont assign 1.0 alpha for parts of the image not inpaint'ed, this way you can maintain some alpha in the image.
2012-08-12 17:31:42 +00:00
Gaia Clary
10004d4a42
fixed: [ #32240 ] Collada import when nodes share geometry but not material
2012-08-12 17:13:07 +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
b2fdb3f50e
avoid divide by zero for the inpaint node.
2012-08-12 17:10:56 +00:00
Campbell Barton
5b678016c3
fix for own error in datatoc.c - data wasn't NULL terminated, in some cases this is expected (broke GLSL shaders).
2012-08-12 16:51:51 +00:00
Peter Schlaile
bd71fb6d1d
== Inpaint Node ==
...
Fixed several small (stupid) issues with the inpaint node:
* on pixel order building, some ranges got wrong and origin was considered
several times.
* the convolution kernel didn't consider all pixels (+1,0),(-1,0),(0,1) and (0-1)
were omited, leading to suboptimal results (sometimes even black areas)
* alpha channel is now only affected an areas considered by inpaint.
That's only important, if you choose low iteration counts.
2012-08-12 15:59:40 +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
51fafdee0c
Sequencer: overlay display type options
...
Before this overlay would happen only for defined rectangle area,
now it's possible to show current / reference frames only, which
makes it possible to do more real slit view involving even displaying
frames on different monitors.
Still some work need to be done to clean interface up and support
displaying color information for reference shot.
2012-08-12 13:24:29 +00:00
Sergey Sharybin
ed564d7cb7
NDOF navigation support for clip editor
2012-08-12 12:15:23 +00:00
Sergey Sharybin
711b97c2ac
Tomato Cycles: use actual number of tiles for viewport rendering
...
Before this debug_tile_size was used as a size of tile, which
became hidden property since tile-based rendering implementation
and couldn't have been controlled.
This resolves the issue with single thread used for viewport
rendering in some cases. Also it makes possible to control tiles
for CUDA viewport rendering, which still behaves much faster when
using the single tile.
Also fixed issue with minimal tile size which was used to calculate
divider of final resolution to be used for initial rendering. Now
it's a Resolution Divider property in Performance tab. This option
could be used to tweak initial resolution of viewport for faster
navigation or faster refresh when changing some properties.
2012-08-12 11:58:34 +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
9cce2d8645
smooth-view for 2d views, graph editor, sequencer, node view, works with border zoom, view selected, view all.
2012-08-12 01:07:31 +00:00
Campbell Barton
b96c622015
style cleanup
2012-08-11 22:12:32 +00:00
Campbell Barton
c567cf3fab
code cleanup: WM naming conventions
2012-08-11 21:35:24 +00:00
Campbell Barton
823083a744
fix for own error with opencl bokeh blur.
2012-08-11 18:47:09 +00:00
Campbell Barton
df1dd658c9
minor improvements to cmake's datatoc usage, now changes to datatoc.c re-make generated files.
2012-08-11 18:39:38 +00:00
Campbell Barton
Sergey Sharybin
Gaia Clary
Mitchell Stokes
Jeroen Bakker
Daniel Genrich
Peter Schlaile