Commit Graph

2334 Commits

Author SHA1 Message Date
Campbell Barton
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
Campbell Barton
7217927414 add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these). 2012-07-29 18:14:20 +00:00
Campbell Barton
c41e1e434a code cleanup: replace MIN2/MAX2 with minf/maxf 2012-07-29 16:59:51 +00:00
Campbell Barton
e32c60284a style cleanup 2012-07-29 00:20:28 +00:00
Sergey Sharybin
5e90606b17 Tomato Cycles: fix for wrong resolution used for rendering Render Layer node
Issue was caused by Cycles using render options from rendering scene, not
from active scene.

For now solved by passing render resolution inside RenderEngine structure.
This probably could be solved in more general way, like adding bindings

for RenderEngine->Render, which would avoid passing options like
is_animation, came_override and so via RenderEngine. Would think about
this a bit more and probably would do that.

The same issue happens in trunk as well, but not consider such a change
trunk-ready, would want to make more tests and probably clean the code
a little bit before commiting this into trunk.
2012-07-27 12:16:23 +00:00
Sergey Sharybin
de6d480f71 Tomato Cycles: fix for memory overflow issue
This fixes memory overflow caused by creating render result every time
RenderResult is creating when updating sample and not being freed until
tile is fully rendered.

Solved in probably not best way -- RenderResult is being stored in
RenderBuffers, so it's creating only once.

This solves memory issues, but while was looking into this issue
discovered dramatic slowdown caused by samples update in some files
from mango svn.

Solving this slowdown is becoming first priority from now on.
2012-07-24 20:05:00 +00:00
Campbell Barton
7baf3d2ece svn merge ^/trunk/blender -r49082:49104 2012-07-21 15:40:47 +00:00
Campbell Barton
62a73381a7 use fabsf when using floats. 2012-07-21 15:27:40 +00:00
Campbell Barton
371e259a0b svn merge ^/trunk/blender -r49037:49061 2012-07-19 10:29:39 +00:00
Campbell Barton
250cdd5e52 code cleanup: remove commented includes - mostly from 2.4x 2012-07-18 23:07:07 +00:00
Campbell Barton
43fede9519 svn merge ^/trunk/blender -r48986:48991 2012-07-17 09:58:20 +00:00
Campbell Barton
32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
Sergey Sharybin
0c087e5154 Merging r48928 through r48937 from trunk into soc-2011-tomato 2012-07-15 10:51:36 +00:00
Sergey Sharybin
50a6cf10b7 Color management: color management support for saving movie files
This enables color management for movie files saving when rendering
animation. It uses the same settings as saving byte images.
2012-07-15 10:43:50 +00:00
Campbell Barton
7cc5af4ef3 minor refactor for rect functions. more consistent naming. 2012-07-15 00:29:56 +00:00
Sergey Sharybin
8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato 2012-07-12 12:12:21 +00:00
Campbell Barton
a5127dba57 vector versions of BLI_in_rctf / BLI_in_rcti, (BLI_in_rctf_v, BLI_in_rcti_v)
use where possible.
2012-07-11 18:17:48 +00:00
Sergey Sharybin
ffd9947001 Merging r48740 through r48749 from trunk into soc-2011-tomato 2012-07-09 10:33:09 +00:00
Campbell Barton
75a5eab8d1 code cleanup 2012-07-08 21:37:59 +00:00
Campbell Barton
1bca7fe492 svn merge ^/trunk/blender -r48691:48729 2012-07-08 15:55:58 +00:00
Campbell Barton
4bc818d240 code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).
also some other minor changes.
2012-07-08 12:23:58 +00:00
Campbell Barton
2c8db87897 fix [#32020] Image will not render in second (any scene other than first) if scene name is longer than 28 characters 2012-07-08 00:04:41 +00:00
Campbell Barton
cfb7aee017 style cleanup 2012-07-07 22:51:57 +00:00
Campbell Barton
84bf3e48c0 style cleanup: use c style comments in C code 2012-07-06 23:56:59 +00:00
Campbell Barton
3a0593cc3d code cleanup: dont use function calls like dot_v3v3, pow and sqrt within macros which results in calling the function multiple times needlessly.
also added some comments.
2012-07-06 22:48:28 +00:00
Campbell Barton
ec233cd747 svn merge ^/trunk/blender -r48674:48681 2012-07-06 14:25:49 +00:00
Campbell Barton
5f792b08e4 fix for rare crash we have with some mango files. 2012-07-06 14:24:41 +00:00
Sergey Sharybin
17d7a9c3d9 Merging r48545 through r48574 from trunk into soc-2011-tomato 2012-07-04 07:33:34 +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
Sergey Sharybin
f80ea57d31 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.
2012-07-02 16:38:06 +00:00
Campbell Barton
0aeb5fc6df printf was being done on uninitialized string. 2012-07-01 15:59:12 +00:00
Campbell Barton
5a803b7edf svn merge ^/trunk/blender -r48415:48469 2012-07-01 15:39:02 +00:00
Campbell Barton
8b865c01cd style cleanup: comments 2012-06-30 22:49:33 +00:00
Campbell Barton
420150f752 svn merge ^/trunk/blender -r48370:48375 2012-06-28 14:19:53 +00:00
Campbell Barton
c8c743b609 code cleanup: compile with clang and quiet some warnings. 2012-06-28 12:32:06 +00:00
Campbell Barton
6b345811b7 svn merge ^/trunk/blender -r48333:48370 2012-06-28 11:20:19 +00:00
Brecht Van Lommel
7c8f82a174 Cycles: regular rendering now works tiled, and supports save buffers to
save memory during render and cache render results.


Implementation notes:

In the render engine API it's now possible to get the render result for
one render layer only, and retrieve the expected tile size in case save
buffers is used. This is needed because EXR expects tiles with particular
size and coordinates.

The EXR temporary files are now also separated per layer, since Cycles
can't give the full render result for all render layers, and EXR doesn't
support writing parts of tiles.

In Cycles internally the handling of render buffers and multi GPU
rendering in particular changed quite a bit, and could use a bit more
refactoring to make things more consistent and simple.
2012-06-28 10:34:38 +00:00
Campbell Barton
32478997ec style cleanup 2012-06-27 18:29:47 +00:00
Campbell Barton
15cb064e1b style cleanup 2012-06-25 07:24:48 +00:00
Campbell Barton
74c9c24d27 style cleanyp 2012-06-23 23:22:19 +00:00
Campbell Barton
0b0ac3aa9e remove scene from new compositor classes. only needs RenderData 2012-06-22 15:06:52 +00:00
Campbell Barton
226c86ae58 use an inline function for rgb -> bw conversion. 2012-06-22 07:49:44 +00:00
Campbell Barton
f5f25b81e8 style cleanup:
also fix for building ghost test and fix double free in one of the tests
2012-06-17 09:58:26 +00:00
Campbell Barton
42d0e34fac style cleanup 2012-06-16 16:57:16 +00:00
Campbell Barton
5049331755 style cleanup 2012-06-13 17:23:44 +00:00
Brecht Van Lommel
01b036f5c6 Fix #31754: strand width fade value 2.0 gives wrong result, should fade out
strand entirely. Fix based on patch by Philipp Oeser.
2012-06-13 15:33:59 +00:00
Campbell Barton
1dec23d33a add rgb_to_luma_y(), was being done inline in many places. 2012-06-13 15:05:42 +00:00
Campbell Barton
1a625d1416 code cleanup: use const float's where possible and specify vector size. 2012-06-12 23:19:52 +00:00
Campbell Barton
105b1031dd code cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines. 2012-06-07 15:49:02 +00:00
Campbell Barton
d5032657ed style cleanup 2012-06-06 22:38:39 +00:00