Brecht Van Lommel
93249c35b1
Fix related to #30384 : multilayer exr files not saving compressed correctly.
2012-03-01 16:41:51 +00:00
Campbell Barton
ea13ec1699
Spelling Cleanup
2012-03-01 12:20:18 +00:00
Campbell Barton
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
Campbell Barton
5148828356
svn merge ^/trunk/blender -r44235:44250
2012-02-19 17:59:30 +00:00
Campbell Barton
02b28e9162
replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
2012-02-19 05:11:24 +00:00
Campbell Barton
48006292d8
svn merge ^/trunk/blender -r44189:44204
2012-02-17 20:56:25 +00:00
Campbell Barton
61596d5bb3
patch [ #30227 ] Various MSVC (32-bit) Warning and Typo Fixes
...
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
2012-02-17 19:21:47 +00:00
Campbell Barton
19d0f93099
svn merge ^/trunk/blender -r43934:43976
2012-02-08 05:45:16 +00:00
Brecht Van Lommel
9467ddb903
Fix #30081 : the fix for #30026 related to rendering indirect/environment light
...
with material ambient zero broke backwards compatibility too much. The behavior
to have ambient zero affect things even if it is not used as a factor does not
make much sense but keeps things compatible. Now instead fixed the use of
uninitialized memory.
2012-02-07 21:04:10 +00:00
Campbell Barton
d0412a1981
svn merge ^/trunk/blender -r43864:43887
2012-02-05 02:30:30 +00:00
Campbell Barton
deec4ce0bc
Code Cleanup: avoid double promotion.
2012-02-04 06:55:29 +00:00
Campbell Barton
075fee4d58
svn merge ^/trunk/blender -r43830:43864
2012-02-03 01:30:21 +00:00
Brecht Van Lommel
5c9ad8653a
Fix #29921 : render rasterization error in a corner case, only happened on 32bit
...
builds because of extended float precision, slightly tweaked code to avoid that,
so that it works the same as on 64bit.
2012-02-02 21:46:11 +00:00
Brecht Van Lommel
01d0e279db
Fix related to #30053 : crash rendering scene strips without a scene (due to missing library).
2012-02-02 13:21:38 +00:00
Campbell Barton
4aa82806ef
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
2012-02-01 09:31:13 +00:00
Brecht Van Lommel
40beecea8f
Fix #30026 : errors rendering material with ambient 0 and AO/env/indirect light.
...
It would skip rendering the latter if ambient was 0, however this is not actually
used in adding the contribution from these.
2012-01-30 19:47:30 +00:00
Campbell Barton
de4eeb9694
svn merge ^/trunk/blender -r43693:43733
2012-01-26 19:20:33 +00:00
Brecht Van Lommel
2e9ae40aaf
Fix #29960 : fields option should not be used for external engine rendering.
2012-01-26 14:55:46 +00:00
Campbell Barton
4fae6cd38d
svn merge ^/trunk/blender -r43685:43693
2012-01-25 18:13:58 +00:00
Brecht Van Lommel
f99343d3b8
Cycles: Render Passes
...
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
Diffuse/Glossy/Transmission x Direct/Indirect/Color
Not supported yet:
* UV, Vector, Mist
Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
2012-01-25 17:23:52 +00:00
Campbell Barton
4966982a5a
svn merge ^/trunk/blender -r43564:43609
2012-01-22 18:04:35 +00:00
Campbell Barton
cd4123e1db
use inline BLI_math functions for dot product and length calculation.
2012-01-22 17:20:37 +00:00
Campbell Barton
c8037fb56a
svn merge ^/trunk/blender -r43530:43554
2012-01-20 12:34:00 +00:00
Sergey Sharybin
f0fc8c22bb
Fix #27120 : Bake to image used for rendering glitch (bake feedback loop)
...
Detect feedback loop and do not bake to images detected in this loop and show
nice warning message in such cases.
It's a way which wouldn't overcomplicate code trying to duplicate images and so
without real benefit.
2012-01-20 07:43:46 +00:00
Campbell Barton
7b2101ace9
svn merge ^/trunk/blender -r43482:43524
2012-01-19 11:31:31 +00:00
Campbell Barton
a87c5eb52c
use color conversions functions in more places.
...
also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
Campbell Barton
4786541285
add utility functions linearrgb_to_srgb_uchar4,
...
linearrgb_to_srgb_uchar3, was being done inline.
2012-01-19 08:22:23 +00:00
Brecht Van Lommel
7162ca5be7
Fix #29922 : NaN pixels due to bump map in degenerate case.
2012-01-18 22:36:19 +00:00
Campbell Barton
917714acf7
svn merge ^/trunk/blender -r43345:43381
2012-01-15 09:16:39 +00:00
Campbell Barton
0d5595befb
add utility function to BLI_math_color - rgb_to_luma, rgb_to_luma_byte, also use rgb_to_grayscale in more places.
2012-01-14 17:14:23 +00:00
Sergey Sharybin
74aede4d71
Fix #29824 : Error writing frame if 3D scene starts after first frame of animation and output is H264
...
Issue was caused by incorrectly set PTS value frames came form Scene strip renderer.
This value used to be calculated from RenderData current and start frame which
lead to non-uniformuly counting which totally confuses encoder.
Switch append_avi and append_ffmpeg to use current frame from rendering scene
(which was already passing to this functions and was used mostly for logging)
and start frame of rendering scene (it's new parameter added). This allowed to
calculate correct PTS value easily and get rid of global static sframe variable
in writeavi.c file.
2012-01-13 09:20:13 +00:00
Campbell Barton
705f23064e
svn merge ^/trunk/blender -r43294:43338
2012-01-13 01:39:57 +00:00
Campbell Barton
c4473dc51c
added comment; zbuffillGLinv4 and zbuffillGL4 are identical except for a 2 lines.
...
no functional changes.
2012-01-12 07:10:44 +00:00
Brecht Van Lommel
e26cd10b7a
Fix #29836 : stress not working as input for displacement texture. Previously it
...
would be computed after displacement, but I don't think this made much sense.
2012-01-11 16:21:17 +00:00
Campbell Barton
98bdf0274b
svn merge ^/trunk/blender -r43183:43220
2012-01-08 13:09:09 +00:00
Andrew Wiggin
da84f3d4c9
Fix build break with double-definition of EXR stubs
...
A better solution would be to mark all function in openexr_multi.h as forceinline or static, but this change just fixes it to work for the reason trunk works: the header defining the stubs is only needs to be included in one .c file
2012-01-07 21:16:15 +00:00
Campbell Barton
0239333f0c
fix error building without openexr
2012-01-05 23:36:03 +00:00
Brecht Van Lommel
f6620d0097
Fix #29723 : wrong IOR for raytraced refraction after reflection inside mesh,
...
patch by Juha Maki-Kanto.
2012-01-05 22:41:56 +00:00
Campbell Barton
2c9f08302c
svn merge ^/trunk/blender -r43160:43183
2012-01-05 22:30:08 +00:00
Brecht Van Lommel
de4befb075
Code refactoring: split render result related functions into separate file.
2012-01-05 17:50:09 +00:00
Campbell Barton
348f116fe5
svn merge ^/trunk/blender -r43124:43160
2012-01-05 11:23:24 +00:00
Sergey Sharybin
829216325d
Fix #29764 : Crash when border rendering in sequencer. (Not Cycles related)
...
Sequencer render context should be as large as the whole frame when rendering
using border without clipping.
Can be implemented in more clear way but it'll require more global refactoring.
2012-01-04 15:28:03 +00:00
Campbell Barton
d0cdefd9fa
svn merge ^/trunk/blender -r43092:43092
2012-01-04 06:20:10 +00:00
Morten Mikkelsen
3b8404ac53
derivative maps must take into account that texture scales can be negative
2012-01-03 22:27:30 +00:00
Morten Mikkelsen
aa1325ef55
calculate factor before using MAX2 macro
2012-01-03 22:18:52 +00:00
Morten Mikkelsen
5fbd6223c5
derivative maps were not working correctly with UV scale (the texture setting size)
2012-01-03 22:09:22 +00:00
Campbell Barton
46f2233a93
svn merge ^/trunk/blender -r43085:43092
2012-01-03 07:33:11 +00:00
Campbell Barton
dcdcaf25ba
fix [ #29761 ] Texture painting with interpolation ignores use alpha
...
reporter - Shawn Zilbert (enigmatic) included patch.
2012-01-03 02:26:32 +00:00
Campbell Barton
c0eec8f379
svn merge ^/trunk/blender -r43062:43085
2012-01-03 02:16:52 +00:00
Brecht Van Lommel
1fc26516ea
Fix #29746 : cycles crash with border render.
2012-01-02 16:20:18 +00:00