griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,121 Commits 1 Branch 0 Tags
3509daa1c1910bf1b2ce8fcbee2e5644b2b3d607
Commit Graph

2157 Commits

Author SHA1 Message Date
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
Campbell Barton
78a4e24614 svn merge ^/trunk/blender -r43009:43033 2011-12-31 12:03:36 +00:00
Miika Hamalainen
6c10080d24 Fix: Material "Vertex Color Light" option didn't apply vertex alpha. 2011-12-31 10:46:21 +00:00
Campbell Barton
81f5c9ed9b svn merge ^/trunk/blender -r42991:43009 2011-12-31 03:07:14 +00:00
Brecht Van Lommel
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
Campbell Barton
50ca81154e svn merge ^/trunk/blender -r42973:42991 2011-12-30 09:23:06 +00:00
Campbell Barton
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
Campbell Barton
bf4deba4d5 svn merge ^/trunk/blender -r42927:42931 2011-12-28 14:05:02 +00:00
Brecht Van Lommel
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
Campbell Barton
dab71f9b12 svn merge ^/trunk/blender -r42882:42886 2011-12-27 04:08:21 +00:00
Campbell Barton
397d7d949f remove unneeded casts from 'unsigned int' to 'int' 2011-12-27 03:54:23 +00:00
Campbell Barton
4ced91da47 svn merge ^/trunk/blender -r42778:42839 2011-12-23 08:41:53 +00:00
Brecht Van Lommel
4d7c44717a Code cleanup: fix some clang static checker warnings. 2011-12-22 20:29:44 +00:00
Campbell Barton
1fef05084e svn merge ^/trunk/blender -r42761:42776 2011-12-20 22:08:24 +00:00
Brecht Van Lommel
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
Campbell Barton
efb4eff353 svn merge ^/trunk/blender -r42722:42742 2011-12-20 01:33:14 +00:00
Campbell Barton
71ce197bbb patch [#28094] New equirectangular world texture mapping option 2011-12-19 23:52:17 +00:00
Campbell Barton
db6cb30941 svn merge ^/trunk/blender -r42669:42670 2011-12-16 23:50:55 +00:00
Brecht Van Lommel
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
Campbell Barton
862dc635ed svn merge ^/trunk/blender -r42617:42655 2011-12-15 23:59:02 +00:00
Morten Mikkelsen
490536561d reenabled auto scale for derivative maps 2011-12-15 15:48:44 +00:00
Antony Riakiotakis
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
Campbell Barton
65f3b93f14 svn merge ^/trunk/blender -r42521:42550 2011-12-10 05:38:00 +00:00
Morten Mikkelsen
82b9e4d16f verify existence of dm 2011-12-10 01:00:12 +00:00
Morten Mikkelsen
965c287630 fixes scale on derivative maps 2011-12-09 23:26:06 +00:00
Campbell Barton
980e68175b svn merge ^/trunk/blender -r42495:42516 2011-12-08 17:32:37 +00:00
Brecht Van Lommel
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
Campbell Barton
22a1ad61f9 svn merge ^/trunk/blender -r42372:42416 2011-12-04 18:39:19 +00:00
Campbell Barton
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
Campbell Barton
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
Campbell Barton
d74c564235 svn merge ^/trunk/blender -r42333:42361 2011-12-02 23:02:21 +00:00
Campbell Barton
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
Campbell Barton
9e5b28cd42 svn merge ^/trunk/blender -r42261:42290 2011-11-30 09:31:11 +00:00
Campbell Barton
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
Campbell Barton
faa022563d svn merge ^/trunk/blender -r42245:42261 2011-11-29 18:18:56 +00:00
Brecht Van Lommel
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
Brecht Van Lommel
93f455dab6 Fix #29411: displacement texture not working anymore, seems part of delta 
scale patch got accidentally committed in revision 41485, reverted now.
 2011-11-29 12:12:12 +00:00
Campbell Barton
063dd4f60a svn merge ^/trunk/blender -r42197:42221 2011-11-28 17:09:13 +00:00
Campbell Barton
53b8c63904 Superficial changes for bmesh bevel to sync with bmesh branch, also noticed length comparison can be done without sqrt for baking. 2011-11-28 03:01:06 +00:00
Campbell Barton
7553440aa4 svn merge ^/trunk/blender -r42172:42182 2011-11-27 01:42:56 +00:00
Brecht Van Lommel
6f1473fb7c Fix #29406: show Sequence as render layer when rendering from sequencer, to make 
it more clear what was rendered.
Fix #29407: external engine api doesn't support full sample yet, would give too
dark render result.
 2011-11-26 18:33:31 +00:00
Campbell Barton
3b5bcab09c svn merge ^/trunk/blender -r42139:42172 2011-11-26 16:29:14 +00:00
Campbell Barton
af7288c407 minor edit - weight_to_rgb() and ramp_blend() now take a float vector rather than 3 float pointers. 
also make particle draw use a float vec.
 2011-11-26 03:13:54 +00:00
Campbell Barton
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
Brecht Van Lommel
2345efc6c5 Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, 
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
 2011-11-23 17:25:25 +00:00
Campbell Barton
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
Campbell Barton
743d2f8c0f rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write) 2011-11-22 00:35:26 +00:00
Campbell Barton
6d6f1b0b4d display quality for avijpeg, name BKE_imtype functions more sensibly 2011-11-22 00:06:54 +00:00