Campbell Barton
6a64f544b1
svn merge ^/trunk/blender -r49945:49947
2012-08-17 11:35:14 +00:00
Campbell Barton
dac761057d
fix for crash showing tooltip for NODE_OT_add_search()
2012-08-17 11:31:54 +00:00
Campbell Barton
99174eacc1
svn merge ^/trunk/blender -r49939:49945
2012-08-17 08:25:23 +00:00
Campbell Barton
219fb7ad79
more draw code cleanup: was making wrong guess about wire color for empty-image draw types. also pass wire color to the metaball.
2012-08-16 18:37:30 +00:00
Campbell Barton
54196f0e94
change to draw extra wire (draw_wire_extra)
...
- was changing color and changing glDepthMask even when the object type didnt support wire drawing and no wire would draw.
- was setting the color when no wire would draw.
2012-08-16 17:42:06 +00:00
Campbell Barton
009b212300
re-work mesh drawing a little since we know the wire color some checks can be avoided.
2012-08-16 17:23:47 +00:00
Campbell Barton
723408cb9b
fix for odd bug/drawing glitch where loose mesh edges would draw with the wrong wire color.
...
This was because the draw code was ignoring the wire color and incorrectly try to figure it out again.
2012-08-16 16:32:50 +00:00
Campbell Barton
e71d3ee394
use filtersize of 1.0 for distort and uv - compositor nodes.
...
Experimenting here and 0.765625f is too sharp, but 1.0 wont blur with 0 distorted pixels but gives nice interpolation otherwise.
2012-08-16 16:07:00 +00:00
Campbell Barton
9af5d8f6da
svn merge ^/trunk/blender -r49933:49939
2012-08-16 14:48:43 +00:00
Campbell Barton
81dd80f1d3
support fro HDR color picking (values over 1.0) when color picking in the image editor or node space.
2012-08-16 14:47:14 +00:00
Campbell Barton
6fb4bbdbd9
compositor bokeh blur - only use the variable size operation when the size socket is connected.
2012-08-16 13:15:13 +00:00
Campbell Barton
efa09a2b3d
fix memory leak in compositor WorkScheduler::initialize()
2012-08-16 12:47:03 +00:00
Campbell Barton
3bc16fd60d
compositor: replace C++ new/delete with guardedalloc.
2012-08-16 12:32:48 +00:00
Campbell Barton
883e9df1cc
fix for bug reading past the buffer bounds for the inpaint node.
2012-08-16 12:13:01 +00:00
Campbell Barton
a843a13008
svn merge ^/trunk/blender -r49929:49933
2012-08-16 10:15:05 +00:00
Campbell Barton
add9aea573
compositor - EWA filter was blurring too much by default, this caused the displace node to blur the image when no displacement was applied, making images fuzzy, the original C code has an interpolation option.
...
Added this option back and use for displace and UV composite nodes.
2012-08-16 10:13:04 +00:00
Sergey Sharybin
63b5338dbd
Fixed incorrect sample counter reported when rendering several render layers
2012-08-16 08:49:43 +00:00
Sergey Sharybin
6f233e1b91
Merging r49920 through r49929 from trunk into soc-2011-tomato
2012-08-16 08:36:26 +00:00
Campbell Barton
121fd266b0
for the default make/cmake wrapper, use ../build_os rather then ../build/os
2012-08-15 22:59:23 +00:00
Gaia Clary
417e99df22
Collada: fixed export when 'active UV Layer only' was selected
2012-08-15 22:08:22 +00:00
Jeroen Bakker
597e6f9bbc
Fix for
...
* [#32323 ] regression: Dispertion artifacts with smaller chunksizes
* [#32125 ] "Projector" Dispersion not working with ChunkSize < 256
2012-08-15 18:14:34 +00:00
Campbell Barton
86a69c5028
dont re-use previous values for link/append operator, would get mixed up with when accessing from a key shortcut.
2012-08-15 11:53:49 +00:00
Campbell Barton
edf617a349
svn merge ^/trunk/blender -r49917:49919
2012-08-15 11:32:56 +00:00
Campbell Barton
60915c9099
escape key now quits composite.
2012-08-15 11:31:04 +00:00
Campbell Barton
f82b93b2c5
svn merge ^/trunk/blender -r49890:49917
2012-08-15 10:36:31 +00:00
Campbell Barton
e2cffbe732
rendering now stops the composite job first, then renders.
2012-08-15 10:31:52 +00:00
Campbell Barton
502dfcce5f
use job types when checking for jobs in areas of the code that made assumptions about job types (that could be wrong)
2012-08-15 10:23:06 +00:00
Campbell Barton
d4a3828630
code cleanup: use TRUE/FALSE for wm jobs
2012-08-15 10:12:41 +00:00
Campbell Barton
15bd03f958
fix for missing change to fluidsim from last commit and name jobs a more useful name - 'wm_job'.
2012-08-15 10:03:29 +00:00
Campbell Barton
97859e8709
add wm job types they are not used yet, so this just defines them for new jobs add add argument to search by job type.
2012-08-15 09:42:06 +00:00
Thomas Dinges
b174610a84
Cmake / Windows:
...
* Fix for Boost lib dir when using msvc 2010.
2012-08-14 19:13:47 +00:00
Campbell Barton
27a8487070
style cleanup: pep8 & unfinished comment from own commit.
2012-08-14 18:43:15 +00:00
Campbell Barton
8b941a80c9
patch [ #32325 ] textured solid backface culling option
...
from Fredrik Hansson (fredrikh)
2012-08-14 18:01:58 +00:00
Lukas Toenne
e83ef85576
Python node operator for combined node collapsing and hiding unused sockets. Socket hide flag is added to RNA as well, but can only be set when the socket is not connected, to avoid dangling links in editor drawing. Currently this operator has no default hotkey, but can be called from the Node menu.
2012-08-14 17:56:33 +00:00
Campbell Barton
3220ef9d95
patch [ #32327 ] Uniform displace modifier
...
from Fredrik Hansson (fredrikh)
With some edits for python UI.
The patch makes the displace modifier treat an empty texture as white.
2012-08-14 17:36:41 +00:00
Thomas Dinges
211d30ea7f
Cmake / Windows:
...
* Fix for Python include path when using msvc 2010.
2012-08-14 16:53:40 +00:00
Campbell Barton
58b5fb7bab
fix [ #32299 ] 16bit float texture + 'Quick Edit' gives wrong result
2012-08-14 15:38:10 +00:00
Sergey Sharybin
8270293e6a
Mango request: display sliders for current point in curve mapping
2012-08-14 14:45:27 +00:00
Campbell Barton
9591142294
add variable size option to bokeh blur node, remove f_stop option (it wasnt used), and add blur_max to the interface.
2012-08-14 14:31:39 +00:00
Campbell Barton
59fedc6b7c
rename blur Reference to Variable Size, improve tooltip
2012-08-14 12:39:12 +00:00
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
