348f116fe5
svn merge ^/trunk/blender -r43124:43160
2012-01-05 11:23:24 +00:00
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
d0cdefd9fa
svn merge ^/trunk/blender -r43092:43092
2012-01-04 06:20:10 +00:00
3b8404ac53
derivative maps must take into account that texture scales can be negative
2012-01-03 22:27:30 +00:00
aa1325ef55
calculate factor before using MAX2 macro
2012-01-03 22:18:52 +00:00
5fbd6223c5
derivative maps were not working correctly with UV scale (the texture setting size)
2012-01-03 22:09:22 +00:00
46f2233a93
svn merge ^/trunk/blender -r43085:43092
2012-01-03 07:33:11 +00:00
dcdcaf25ba
fix [ #29761 ] Texture painting with interpolation ignores use alpha
...
reporter - Shawn Zilbert (enigmatic) included patch.
2012-01-03 02:26:32 +00:00
c0eec8f379
svn merge ^/trunk/blender -r43062:43085
2012-01-03 02:16:52 +00:00
1fc26516ea
Fix #29746 : cycles crash with border render.
2012-01-02 16:20:18 +00:00
cc3adc2202
Merged changes in the trunk up to revision 43038.
...
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2011-12-31 21:09:26 +00:00
78a4e24614
svn merge ^/trunk/blender -r43009:43033
2011-12-31 12:03:36 +00:00
6c10080d24
Fix: Material "Vertex Color Light" option didn't apply vertex alpha.
2011-12-31 10:46:21 +00:00
81f5c9ed9b
svn merge ^/trunk/blender -r42991:43009
2011-12-31 03:07:14 +00:00
d7d856a23d
Color management: add "Color Unpremultiply" option for images and render settings.
...
For premultiplied alpha images, this makes any color space conversion for the image
or render output work on color without alpha multiplied in.
This is typically useful to avoid fringing when the image was or will be composited
over a light background. If the image will be composited over a black background on
the other hand, leaving this option off will give correct results.
In an ideal world, there should never be any color space conversion on images with
alpha, since it's undefined what to do then, but in practice it's useful to have
this option.
Patch by Troy Sobotka, with changes by me.
2011-12-30 14:17:11 +00:00
50ca81154e
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
5ed0cd4ad7
possible fix for [ #29708 ] Crashes when Rendering Cross Dissolve + XVID Codec
...
was calling memcpy with both src and dst args were the same pointer.
2011-12-29 13:12:40 +00:00
bf4deba4d5
svn merge ^/trunk/blender -r42927:42931
2011-12-28 14:05:02 +00:00
b9ff5840a6
Code refactoring: add unified image buffer functions for doing float => byte,
...
byte => float, float => float, byte => byte conversions with profile, dither
and predivide. Previously code for this was spread out too much.
There should be no functional changes, this is so the predivide/table/dither
patches can work correctly.
2011-12-28 13:29:33 +00:00
0896a22723
Merged changes in the trunk up to revision 42902.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
dab71f9b12
svn merge ^/trunk/blender -r42882:42886
2011-12-27 04:08:21 +00:00
397d7d949f
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
4ced91da47
svn merge ^/trunk/blender -r42778:42839
2011-12-23 08:41:53 +00:00
4d7c44717a
Code cleanup: fix some clang static checker warnings.
2011-12-22 20:29:44 +00:00
1fef05084e
svn merge ^/trunk/blender -r42761:42776
2011-12-20 22:08:24 +00:00
81c635a3bb
Fix #25775 : crash using border render from external render engines, merging
...
back the tile used wrong offsets.
2011-12-20 12:25:18 +00:00
efb4eff353
svn merge ^/trunk/blender -r42722:42742
2011-12-20 01:33:14 +00:00
71ce197bbb
patch [ #28094 ] New equirectangular world texture mapping option
2011-12-19 23:52:17 +00:00
4a92ee2831
Merged changes in the trunk up to revision 42692.
2011-12-17 21:24:39 +00:00
db6cb30941
svn merge ^/trunk/blender -r42669:42670
2011-12-16 23:50:55 +00:00
3311164b24
Math lib: matrix multiplication order fix for two functions that were
...
inconsistent with similar functions & math notation:
mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)
For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
862dc635ed
svn merge ^/trunk/blender -r42617:42655
2011-12-15 23:59:02 +00:00
490536561d
reenabled auto scale for derivative maps
2011-12-15 15:48:44 +00:00
6ccc605660
Bicubic bump map filtering.
...
This commit introduces bicubic bump map capabilities for the viewport for OpenGL 3.0+ capable GPUs.
To use the functionality change the bump mapping method to "best quality"
Previous "best quality" setting becomes "medium quality" now.
For non OpenGL 3.0 GPUs this becomes the same as "medium quality"
Also:
* added tooltip descriptions to the bump method settings.
* modified the shader to ommit extraneous matrix multiplications for matrices already provided by OpenGL.
Bicubic shader by Morten Mikkelsen. Thanks a lot!
Oh...and FIRST!
2011-12-15 13:58:09 +00:00
efc4341ee4
Merged changes in the trunk up to revision 42556.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
2011-12-10 20:54:43 +00:00
65f3b93f14
svn merge ^/trunk/blender -r42521:42550
2011-12-10 05:38:00 +00:00
82b9e4d16f
verify existence of dm
2011-12-10 01:00:12 +00:00
965c287630
fixes scale on derivative maps
2011-12-09 23:26:06 +00:00
980e68175b
svn merge ^/trunk/blender -r42495:42516
2011-12-08 17:32:37 +00:00
f8ccc111cf
Tweak related to #29545 : show info message if no frames are written in animation
...
render due to disabled Overwrite option.
2011-12-08 14:21:55 +00:00
3197796cf7
Merged changes in the trunk up to revision 42425.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
2011-12-05 02:12:49 +00:00
22a1ad61f9
svn merge ^/trunk/blender -r42372:42416
2011-12-04 18:39:19 +00:00
9c5ad4fb60
remove old renderer struct member, was only used for setting yafray but was still being checked in a few places,
2011-12-04 16:22:53 +00:00
3fdc28b736
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.
...
this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
2011-12-04 03:35:54 +00:00
d74c564235
svn merge ^/trunk/blender -r42333:42361
2011-12-02 23:02:21 +00:00
06c3d5bd09
de-duplicate dominant axis calculation, exact same checks were in 6 different places.
...
added function: axis_dominant_v3(...)
2011-12-02 22:14:20 +00:00
9e5b28cd42
svn merge ^/trunk/blender -r42261:42290
2011-11-30 09:31:11 +00:00
6403858ad9
fix [ #29111 ] Wrong application of delta scale
...
apply delta scale as a multiplier & do-versions on existing files.
- bumps subversion to 2.60.6
2011-11-29 21:13:37 +00:00
faa022563d
svn merge ^/trunk/blender -r42245:42261
2011-11-29 18:18:56 +00:00
8c01369935
Fix #29028 : dupli objects missing speed vectors. Check for avoiding creation of
...
speed vectors was checking object instead of object instance layer, which is the
one that is actually used for render layer checks.
2011-11-29 15:46:33 +00:00
