Commit Graph

66005 Commits

Author SHA1 Message Date
Sergey Sharybin
4085056218 Place color weels used for color balance in sequencer vertically
This was it makes more sense from accurate tuning point of view.
2012-08-07 14:59:49 +00:00
Thomas Dinges
c8934b44f9 Tomato Cycles:
* Improvement for reporting current sample.
Also show the current amount of rendered samples, when using the CPU, and 1x1 tiles.
2012-08-07 14:02:53 +00:00
Jens Verwiebe
17fdc45437 OSX/cmake: refactoring of setting endianess defines, this fixes compile of builds with endianess other than the buildmachine and avoids also failing configuration with xcode 4.4 due not supporting big_endian archs anymore 2012-08-07 13:51:19 +00:00
Campbell Barton
9ad19c26ca svn merge ^/trunk/blender -r49644:49653 2012-08-07 13:38:35 +00:00
Campbell Barton
719aedaf60 mask - draw both sides of the curve when filled option is disabled. 2012-08-07 13:37:16 +00:00
Sergey Sharybin
b364f6e692 Tomato Cycles: report currently rendering sample when using GPU
Currently it makes more sense to use single tile for GPU rendering
and in this case tile-based progress report doesn't work well.

Since threading happens within single tile, it's possible to
detect currently computing sample and report it to the interface,

This also allows to display smoother progress when using CPU
with small amount of tiles.
2012-08-07 13:27:19 +00:00
Thomas Dinges
fcc18fe5e3 Code Cleanup:
* Remove old comment, Internal Player is working again.
2012-08-07 13:22:40 +00:00
Howard Trickey
3e5cbb48f6 Fix knife stack overflow (bug #31907).
The mutual recursion was removed: it was not needed.
2012-08-07 12:54:32 +00:00
Jens Verwiebe
9ee3a8655f Fix for fix, now nested 2012-08-07 12:09:48 +00:00
Jens Verwiebe
d4029de0d6 Fix for endiantest, xcode condition interferred with other os 2012-08-07 12:03:43 +00:00
Lukas Toenne
9388d04911 Fix for particle influence textures. These now work with "Particle/Strand" input coordinates, mapping the relative particle index into the [-1, 1] Y-coordinate range. 2012-08-07 10:54:50 +00:00
Jens Verwiebe
5bcdecd72b OSX: disable kernels in cycles gpu again, would only work in 10.8 afaik 2012-08-07 10:10:03 +00:00
Campbell Barton
8516821225 svn merge ^/trunk/blender -r49638:49644 2012-08-07 10:06:31 +00:00
Campbell Barton
b218d90176 fix a crash when python is registering enum properties and the items argument is a generator (some sequence type besides a list/typle), in this case it could free the strings before blender duplicates them.
this fixes [#32192] Import Images as Planes script is broken
2012-08-07 10:03:14 +00:00
Jens Verwiebe
b9c441536c OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management 2012-08-07 10:02:34 +00:00
Sergey Sharybin
0d8a245623 Code cleanup: remove unused sample counter from render session
It's not used since new tile-based rendering and it was confusing
to have it in both session and tile manager.

Should be no functional changes.
2012-08-07 09:54:55 +00:00
Sergey Sharybin
9460619199 Tomato Cycles: do not discard unfinished tiles on cancel
Do not discard (fill with black) tiles which are not fully rendered
(not all the samples are calculated for tile) when canceling render.

This could be helpful to tweak some settings when render glitch is
discovered. Also it could be used in such scenarios as setting
samples number to something really high and render still image
until result is reasonable, controlling this manually.

This could make cancel not so responsible on CPU, but it wouldn't
be less responsible than GPU, also could potentially give some
%% of speedup by avoiding checking cancel state after every pixel
sampled.
2012-08-07 09:22:26 +00:00
Campbell Barton
8ae89f4942 speedup to inpaint node in my tests was about ~30% for an optimized build.
also replace MIN/MAX2 with inline functions in transform.
2012-08-07 09:20:30 +00:00
Sergey Sharybin
924ba23d53 Merging r49635 through r49638 from trunk into soc-2011-tomato 2012-08-07 07:59:48 +00:00
Lukas Toenne
cfe7bab080 Fix for drawing arrows on node lines between two reroute nodes. This was a typo in r48762 which inverted the arrow scale. 2012-08-06 20:48:08 +00:00
Campbell Barton
62c8772a91 svn merge ^/trunk/blender -r49628:49634 2012-08-06 19:37:35 +00:00
Campbell Barton
6498c054e0 remove unused mask pointer 2012-08-06 19:31:34 +00:00
Campbell Barton
d5b9ae57ca Switching images in the image space would modify UV coordinates.
This is an intended feature but works too unreliably.

- This setting was stored in each face and only editable by re-running the unwrap, this is too hidden (only discovered this by reading code).
- This worked with blender internal but not with cycles, such basic options as changing an image shouldn't behave different depending on the render engine selected.

I've ifdef'd out the aspect correction for now, it could be added back as a per scene option and be made to run on both cycles or blender internal but for now I prefer to keep this disabled.
2012-08-06 19:28:22 +00:00
Bastien Montagne
43c3fa6c39 Adding "inpaint" as allowed words... 2012-08-06 19:19:51 +00:00
Lukas Toenne
723e52fb85 Tile fix: Use the validity flag in node links directly instead of the indirect node level check for cyclic links to avoid crash in cases of invalid links, which can be created in some situations (reroute nodes). The link flag may have been set by additional constraints. It is much simpler to use and avoids the redundant check. 2012-08-06 19:11:59 +00:00
Lukas Toenne
f961afece0 Fix for incomplete Reroute node updates. Adding reroute nodes by spliting links would often result in unrelated color sockets or otherwise miss updates.
The reason is that the per-node updates used for Reroute node type inheritance are not supposed to be looking at connected nodes, they are purely for "local" updates. For this sort of "global" update which requires depth-first search, the update function on the node tree level must be used instead.
2012-08-06 18:49:28 +00:00
Sergey Sharybin
86736412a0 Merging r49624 through r49628 from trunk into soc-2011-tomato 2012-08-06 17:07:20 +00:00
Lukas Toenne
e276a7c805 Fix for Reroute nodes: Reloading could change socket types without updating the socket data structs, leading to crash. This is caused by the node verification procedure, which resets any socket type to the initial type defined in the socket templates. Adding sockets dynamically without templates solves this (the sockets are then ignored by verification). 2012-08-06 16:25:38 +00:00
Campbell Barton
db6c4ba11e bring back the play option from 2.4x 2012-08-06 16:07:11 +00:00
Campbell Barton
48b59330fe missed this when merging inpaint 2012-08-06 15:59:09 +00:00
Campbell Barton
cc1af6bb36 fix for memory leak playing animations. 2012-08-06 15:54:52 +00:00
Sergey Sharybin
24fc0287f3 Merging r49622 through r49623 from trunk into soc-2011-tomato 2012-08-06 15:22:19 +00:00
Sergey Sharybin
a334b5a4b6 Made feather self-intersection check an option.
Useful in cases when masking stuff like self-intersecting
ropes. This could probably be smarter option, but can't
currently think about robust approach here.
2012-08-06 15:20:14 +00:00
Campbell Barton
fd666b2c78 fix for bge module imports so you can do for eg:
import bge.render as render
2012-08-06 14:29:25 +00:00
Campbell Barton
e2203d548e svn merge ^/trunk/blender -r49601:49620 2012-08-06 14:02:03 +00:00
Campbell Barton
385c38f6ed misc small edits syncing with trunk 2012-08-06 13:59:11 +00:00
Sergey Sharybin
b282b5275c Mask feather self-intersection check
Enable self-intersection check for preview. In own tests average
time for this operation on mango files was ~0.0015sec, and it was
like 20 splines max which still gives pretty smooth performance
on my core quad machine.

Would think let's check how it works for now, if it'll give some
issues here, would just avoid tessellation on every redraw by
storing tessellation in some cache (probably in mask user).

Another change is related on a way which loop to collapse.
Changed length check with AABB size check. A bit slower but
should be a bit more predictable.
2012-08-06 13:53:38 +00:00
Campbell Barton
2b8ac9bc61 inpaint node from tomato branch by Peter Schlaile
http://en.wikipedia.org/wiki/Inpainting
2012-08-06 13:45:11 +00:00
Daniel Genrich
731c6ebec4 Patch [#32246] (Bugfix): UV editor -> "Proportional edit" together with "constrain to bounds" does not work.
Patch reviewed by Campbell Barton. Thanks!
2012-08-06 13:40:29 +00:00
Howard Trickey
21a137471d Fix to knife: would sometimes miss cuts on non-planar faces.
Also, there was a needless loop through all three loops of
a tesselation triangle, which all share the same original face.
Also, made an early out for case where an edge cut had already
been discovered on a Knife edge.
2012-08-06 13:37:25 +00:00
Howard Trickey
244714d53e Remove redundant typedef of BLI_Stack
(caused compilation errors with some compilers)
2012-08-06 13:31:28 +00:00
Campbell Barton
7beb47bd69 fix for freeing NULL pointer. 2012-08-06 13:04:40 +00:00
Campbell Barton
43d855c846 fix for own bug - missing NULL check when the image space starts a render job 2012-08-06 12:14:02 +00:00
Campbell Barton
75a188272e move pivot point and cursor out of UV rna into image space since both mask and uvedit use them. 2012-08-06 12:12:45 +00:00
Daniel Genrich
4c4973350e Bugfix: Crash when changing collider type after loading blend file.
Thanks to MiikaH for pointing out.
2012-08-06 11:55:52 +00:00
Lukas Toenne
54b61401ed Fix #32271, Node group/parent crash. The grouping operators need to also look at the non-selected nodes in the edit tree to find nodes whose parent is to be moved but the child is not, and then detach those. 2012-08-06 11:23:09 +00:00
Campbell Barton
2988c81d6b fix [#32272] crash while rendering and modifying the node setup. 2012-08-06 10:13:49 +00:00
Sergey Sharybin
c93be80be9 Tomato Cycles: report current scene and render layer being rendering
Helps figuring out what exactly takes time when rendering in render farm.
2012-08-06 10:10:35 +00:00
Campbell Barton
4e2fb45576 style cleanup 2012-08-06 10:03:17 +00:00
Campbell Barton
77610e1550 svn merge ^/trunk/blender -r49573:49601 2012-08-06 09:33:43 +00:00