Sergey Sharybin
21e403e546
Merging r49953 through r50015 into from trunk into soc-2011-tomato
2012-08-19 13:57:55 +00:00
Campbell Barton
e9caa21830
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
Campbell Barton
f1537c64a5
svn merge ^/trunk/blender -r49867:49886
2012-08-14 11:07:42 +00:00
Campbell Barton
ca7d1ec39d
style cleanup: use <pre> for doxygen ascii art
2012-08-13 15:17:15 +00:00
Sergey Sharybin
2e30bf28c1
Merging r49711 through r49737 from trunk into soc-2011-tomato
2012-08-09 17:03:33 +00:00
Campbell Barton
f0951f58ca
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
2012-08-08 18:37:06 +00:00
Sergey Sharybin
5ad7ab03e3
Merging r49681 through r49707 from trunk into soc-2011-tomato
2012-08-08 16:48:05 +00:00
Sergey Sharybin
1bf893e9c8
Code cleanup: BKE_ prefix for public sequencer functions
2012-08-08 11:15:40 +00:00
Campbell Barton
77610e1550
svn merge ^/trunk/blender -r49573:49601
2012-08-06 09:33:43 +00:00
Campbell Barton
dfdfa06c27
code cleanup: minor edit - replace memset() with zero initialization, remove unneeded NULL check in ibuf_sample()
2012-08-05 15:04:10 +00:00
Campbell Barton
9ddbd8329e
fix uninitialized memory use for mask feather points, also remove some double promotions.
2012-08-05 13:26:39 +00:00
Sergey Sharybin
cae3dbd141
Merging r49534 through r49573 from trunk into soc-2011-tomato
2012-08-05 12:54:39 +00:00
Campbell Barton
3d20474414
style cleanup
2012-08-04 19:34:38 +00:00
Campbell Barton
9ff4fa6671
style cleanup
2012-08-04 12:30:16 +00:00
Sergey Sharybin
f736f183a5
Merging r49499 through r49518 from trunk into soc-2011-tomato
2012-08-03 09:08:40 +00:00
Campbell Barton
e86e5074f6
code cleanup: double promotion warnings
2012-08-02 21:17:12 +00:00
Campbell Barton
ba5c635502
fix for crash when node groups loose their ID pointer references (when linked libs don't load)
2012-08-02 16:33:38 +00:00
Campbell Barton
ce3293b2d9
code cleanup: remove redundant float casts
2012-08-02 11:33:21 +00:00
Sergey Sharybin
3f5e3ae0bf
Merging r49413 through r49450 from trunk into soc-2011-tomato
2012-08-01 14:14:22 +00:00
Sergey Sharybin
8a1a4a453d
Tie compositor will now update render result when changing node setup
...
Issue was caused by the way how render result was acquiring -- pointer
to render data was used to find needed render descriptor. It's not
reliable since render contains copy of scene's render data, not pointer
to this data.
Use node scene's id name for render result acquiring, the same way
as it was done in old compositor system.
2012-08-01 13:59:08 +00:00
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
