griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

3420 Commits

Author SHA1 Message Date
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
Tamito Kajiyama
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
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
Tamito Kajiyama
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
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
Tamito Kajiyama
b6569ee4e7 Merged changes in the trunk up to revision 42116. 2011-11-26 13:11:55 +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
Campbell Barton
da25b50ccb image save operator now shares settings and UI with render & image out node. 
details:
- setting format options from python isnt possible anymore since this isnt exposed via op->properties, python should use image.save() function instead.
- image save UI now hides 'Relative' option when copy is selected since it has no effect.
- default image depth is set to 8 or more if the image has no float buffer, otherwise its set to 32 or less.

other fixes:
- image new was adding an image with a filepath set to "untitled", if this file happened to exist in the current directory a save on the generated image would overwrite it, now initialize to empty path.
- BKE_ftype_to_imtype was returning an invalid value if ftype==0.
 2011-11-21 23:56:32 +00:00
Campbell Barton
30fd1ab523 replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth 2011-11-21 20:47:19 +00:00
Campbell Barton
0e2c8cdcdd move image settings into their own structure so the interface can be shared where image saving settings are needed. 
currently file out node and render output share this struct & UI.
 2011-11-21 20:19:58 +00:00
Tamito Kajiyama
2676f2d58f Merged changes in the trunk up to revision 42021. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
 2011-11-20 21:02:12 +00:00
Campbell Barton
8eb41f0fdb svn merge ^/trunk/blender -r41998:42009 2011-11-20 16:05:51 +00:00
Campbell Barton
f1eb66aa68 share code for fluidsim, ocean & dynamic paint file paths. 
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
 2011-11-20 14:38:11 +00:00
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
Brecht Van Lommel
5d2a155f2b Camera: some more refactoring, mostly in the function that computes the camera 
border, now we just get the border coordinates from comparing the viewport and
camera viewplanes.
 2011-11-19 18:35:42 +00:00
Brecht Van Lommel
539c94a051 Camera: some code refactoring, use an intermediate CameraParams struct instead 
of long list of variables everywhere. Intention is to also let 3d view use this
eventually, instead of duplicating code.
 2011-11-18 15:52:00 +00:00
Campbell Barton
9d05ccf9e8 svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined 2011-11-16 19:06:38 +00:00
Brecht Van Lommel
c6bbe25c29 Fix #29093: world zenith up and down texture influence were not working 
correct. These were decoupled from horizon influence for 2.5, but not
actually used in the render engine.
 2011-11-16 15:47:25 +00:00
Brecht Van Lommel
c4e029a274 Fix #29287: cycles and other external render engines did not print correct frame 
number in background render.
 2011-11-16 12:47:37 +00:00
Campbell Barton
e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender 2011-11-15 02:58:06 +00:00
Campbell Barton
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
Campbell Barton
49ccf975f2 minor cleanup 
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
 2011-11-14 16:05:44 +00:00
Campbell Barton
e058110b70 fix uninitialized memory use when an object has modifiers but no ocean modifier. 2011-11-14 06:11:40 +00:00
Campbell Barton
bb934ad883 Ocean baking was using uninitialized memory, but further investigation it was calculating foam values when they were not used. 
avoid calculating foam and allocating memory when its not needed.
 2011-11-14 05:55:50 +00:00
Campbell Barton
dfd20bb888 remove double promotions and some formatting edits (tabs & spaces mixed) 2011-11-13 16:10:01 +00:00
Campbell Barton
7edd4f93f1 add missing break in ocean_texture switch statement & quiet some warnings. 2011-11-13 14:11:02 +00:00
Lukas Toenne
11c83d8432 Ocean Sim modifier patch 
by Matt Ebb, Hamed Zaghaghi

This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]

The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.

[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean

[2]
http://www.savetheoceansim.com

[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
 2011-11-13 12:17:27 +00:00