Commit Graph

2383 Commits

Author SHA1 Message Date
Sergey Sharybin
8f53bd019f Merging r48264 through r48276 from trunk into soc-2011-tomato 2012-06-25 16:37:58 +00:00
Brecht Van Lommel
3271850a2f Fix cycles not working in 3d local view, and missing update when toggling hiding
in the outliner.
2012-06-25 11:43:22 +00:00
Brecht Van Lommel
ae797383b7 Guardedalloc/C++: delete is valid on a NULL pointer, add a check so MEM_freeN
doesn't print warning messages.
2012-06-25 11:43:12 +00:00
Brecht Van Lommel
2b41b6d669 Fix for cycles building with assertions on scons/windows. 2012-06-25 11:42:58 +00:00
Campbell Barton
158a70c8a3 the mutex struct seems to be different across systems, use memset rather then an initializer value.
also quiet warning in cycles.
2012-06-25 11:19:38 +00:00
Sergey Sharybin
ae063aae50 Merging r48257 through r48263 from trunk into soc-2011-tomato 2012-06-25 10:56:48 +00:00
Campbell Barton
3c8a4c458b more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed. 2012-06-25 10:35:24 +00:00
Campbell Barton
cc0784c1b9 optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro. 2012-06-25 09:14:37 +00:00
Campbell Barton
17516fee26 svn merge ^/trunk/blender -r48245:48254 2012-06-25 07:41:01 +00:00
Sergey Sharybin
49e0175e40 Use own version of ff_update_cur_dts for FFmpeg >= 0.11, seems
linking against function which isn't public in API gives error
when met some circumstances.
2012-06-25 07:14:21 +00:00
Sergey Sharybin
679dcfdf63 Merging r48241 through r48245 from trunk into soc-2011-tomato 2012-06-24 18:01:46 +00:00
Sergey Sharybin
e60c2f5c3e Mark some utility functions as static to avoid namespace conflicts
and make export symbol table smaller.
2012-06-24 15:54:36 +00:00
Sergey Sharybin
ca24daea64 Merging r48224 through r48237 from trunk into soc-2011-tomato 2012-06-24 14:27:23 +00:00
Campbell Barton
74c9c24d27 style cleanyp 2012-06-23 23:22:19 +00:00
Sergey Sharybin
06fb9c85d4 Merging r48196 through r48223 from trunk into soc-2011-tomato 2012-06-23 18:08:56 +00:00
Campbell Barton
263be14811 rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate. 2012-06-23 13:42:14 +00:00
Campbell Barton
78b2f5df47 svn merge ^/trunk/blender -r48147:48153 2012-06-21 08:07:49 +00:00
Thomas Dinges
3ba31f0481 * Fix for the Cycles XML commit yesterday, blur_glossy has a different internal variable name. 2012-06-21 08:02:18 +00:00
Campbell Barton
b7640d614a svn merge ^/trunk/blender -r48140:48147 2012-06-21 06:10:51 +00:00
Thomas Dinges
b84ee5ae7c Cycles XML:
* Add recent integrator options.
2012-06-20 21:12:38 +00:00
Campbell Barton
e631cf7062 svn merge ^/trunk/blender -r48119:48129 2012-06-20 17:12:20 +00:00
Campbell Barton
a744fed46c style cleanup 2012-06-20 16:43:48 +00:00
Brecht Van Lommel
e3e75b3936 Fix #31883: cycles vectors pass rendering crash with some render layers using
it and others not.
2012-06-20 14:24:52 +00:00
Campbell Barton
858ad8d725 svn merge ^/trunk/blender -r48078:48105 2012-06-20 07:43:49 +00:00
Campbell Barton
98e6912480 style cleanup 2012-06-19 22:17:19 +00:00
Campbell Barton
66617d1b13 svn merge ^/trunk/blender -r47961:48070 2012-06-19 08:16:07 +00:00
Sergey Sharybin
0d64e050ea Reduce amount of deprecated symbols used from FFmpeg
This switches some areas of Blender which are related on FFmpeg stuff
from deprecated symbols to currently supported one.

Pretty straightforward changes based on documentation of FFmpeg's
API which symbols should be now used.

This should make Blender compatible with recent FFmpeg 0.11.

Should be no functional changes.
2012-06-18 10:29:11 +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
b5b8306685 code cleanup: includes, also correct some py example typos 2012-06-16 20:20:07 +00:00
Campbell Barton
606d76f07d fix for building blender as a python module on windows. 2012-06-15 20:59:00 +00:00
Sergey Sharybin
471627ba96 Commit current patch needed for color pipeline investigation in Mango Project
This commit simply adds view transform option for image editor. This transform
is being applied on original linear color when float buffer is being converted
into sRGB byte buffer.

Currently supports such transformations:
- ACES ODT ToneCurve transform which shall preserve color ranges on such
  a conversion.
- OCIO Raw, Log and RRT view transforms

This commit also contains integration of OCIO backends to Blender, so
now there's c-api and configuration file. Most of things were got from
branch where Xavier Thomas and Lukas Toene were working.

NOTE:
This is just for testing our pipeline, please do not bother me with messages
it's done wrong. It is done correct to support our own pipeline for now, and
real design would be created later when current stoppers for the project are
gone.
2012-06-15 15:00:51 +00:00
Brecht Van Lommel
6a8fceb8b8 Fix cycles non-progressive integrator not delivering correct AO pass. 2012-06-15 10:15:10 +00:00
Campbell Barton
a57c8a37a1 comment unused vars 2012-06-14 11:05:15 +00:00
Thomas Dinges
bccadfb335 Cyles UI:
* Alignment fix for the "Samples" panel, this way both columns are aligned nicely.
2012-06-14 08:58:23 +00:00
Peter Larabell
94a0355795 simple assignments added to pre-processor temporary section of function to avoid unused argument compiler warnings. 2012-06-13 21:37:39 +00:00
Peter Larabell
ceffc2cd50 add Anti-Aliasing (very rough draft algorithm, NOT FINAL version) to raskter lib. Code is still quite messy but will be replaced when final algo comes in anyway. 2012-06-13 19:57:23 +00:00
Brecht Van Lommel
4940482e59 Fix issue with missing emission in non-progressive integrator. 2012-06-13 17:34:47 +00:00
Thomas Dinges
7818b94016 Cycles:
* "preview_aa_samples" minimum should be 0, not 1.
2012-06-13 16:15:42 +00:00
Thomas Dinges
342fb0a19e Cycles:
* UI Tooltip fix.
2012-06-13 14:18:42 +00:00
Brecht Van Lommel
4ba456d175 Cycles: first step for implementation of non-progressive sampler that handles
direct and indirect lighting differently. Rather than picking one light for each
point on the path, it now loops over all lights for direct lighting. For indirect
lighting it still picks a random light each time.

It gives control over the number of AA samples, and the number of Diffuse, Glossy,
Transmission, AO, Mesh Light, Background and Lamp samples for each AA sample.

This helps tuning render performance/noise and tends to give less noise for renders
dominated by direct lighting.

This sampling mode only works on the CPU, and still needs proper tile rendering
to show progress (will follow tommorrow or so), because each AA sample can be quite
slow now and so the delay between each update wil be too long.
2012-06-13 11:44:48 +00:00
Brecht Van Lommel
74a85df0c1 Fix cycles crash when viewport camera border goes out of view. 2012-06-13 11:25:36 +00:00
Brecht Van Lommel
5e2a9a261b Fix cycles object_flag array being allocated too big. 2012-06-13 11:25:22 +00:00
Lukas Toenne
f73d5f2c44 Fix #31780, cycles nested group rendering broken. Was using the dupli object 'index' member to identify dupli objects, but this is not unique and in fact just 0 in most cases. Needs to use a simple dupli list counter instead. 2012-06-13 08:10:59 +00:00
Thomas Dinges
72c668a84a Cycles:
* Add back a break, which was deleted in r47773.
2012-06-12 19:04:12 +00:00
Lukas Toenne
43d1df9f47 Fix #31675 Reroute nodes aren't working for cycles.
Note that currently the reroute nodes are hardcoded to color values, which means they will not work for shader type connections (and possibly cause overhead for float and vector conversion). Looking into a solution.
2012-06-12 07:27:50 +00:00
Campbell Barton
9c504f6db2 correct freeing C++ arrays. 2012-06-10 20:14:15 +00:00
Campbell Barton
51d9bf725d style cleanup 2012-06-10 19:59:02 +00:00
Lukas Toenne
0586705b63 Fix #31747, broken image sequence loading after r47432.
The image file name function was updating the iuser->framenr using a supposed cfra parameter. However, the actual cfra is unknown when loading movies or sequences, so the iuser->framenr value itself was passed in its place, leading to incremental addition of the iuser frame offset. Removed the cfra parameter altogether from the image path function. This should instead be done separately if necessary, it's not an inherent part of constructing the image file name.
2012-06-10 07:35:45 +00:00
Campbell Barton
2c1abe1f58 style cleanup: assignment & indentation. 2012-06-09 18:56:12 +00:00
Campbell Barton
c6cffe98fa code cleanup: removed/renamed shadow & duplicate variable definitions. 2012-06-09 18:20:40 +00:00