griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,752 Commits 1 Branch 0 Tags
6fa349f85e8feff90ba00a52b3669e28ea09c223
Commit Graph

2309 Commits

Author SHA1 Message Date
Campbell Barton
5ed2e0d5bc svn merge ^/trunk/blender -r46979:47003 2012-05-25 09:42:58 +00:00
Daniel Genrich
f883d12e0c Smoke: Start fixing scaling issues which happen with non cube-shaped domains. 
Detail: Smoke solver and Blender side of smoke now share the same cell length.

First reported by the Sintel artists long ago, again reported by MiikaH.

Part of my Smoke Development Project Phase III.
 2012-05-24 23:50:20 +00:00
Campbell Barton
25b677787f svn merge ^/trunk/blender -r46966:46979 2012-05-24 16:37:40 +00:00
Campbell Barton
9abd6e7651 style cleanup 2012-05-24 13:18:53 +00:00
Sergey Sharybin
14a56caee6 Merging r46725 through r46963 from trunk into soc-2011-tomato 2012-05-24 09:47:29 +00:00
Brecht Van Lommel
7f7ba3243d Fix cycles render issue with a (useless) mix node that has the same shader 
plugged into both sockets.
 2012-05-23 17:55:34 +00:00
Brecht Van Lommel
f8481fed47 Fix: cycles not supporting scene background sets. 2012-05-23 09:46:33 +00:00
Campbell Barton
eb023322ef style cleanup: mmap_win32 2012-05-22 13:20:01 +00:00
Brecht Van Lommel
c3e1fce775 Cycles: add Object Info node, with outputs object location, object/material 
pass index, and a random number unique to the instance of the object.

This can be useful to give some variation to a single material assigned to
multiple instances, either manually controlled through the object index, based
on the object location, or randomized for each instance. 

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info
 2012-05-21 12:52:28 +00:00
Campbell Barton
be53fde9cd code cleanup: 
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke
 2012-05-21 06:33:45 +00:00
Campbell Barton
9c9a5b882d style cleanup: ghost 2012-05-19 09:57:55 +00:00
Campbell Barton
112b1a0779 style cleanup: ghost headers 2012-05-19 09:23:08 +00:00
Campbell Barton
6522880772 style cleanup: ghost/x11 2012-05-18 20:13:40 +00:00
Thomas Dinges
e63040a263 Tomato Branch: 
* Fix for msvc, it needs stdio header for the NULL keyword.
 2012-05-18 19:17:55 +00:00
Brecht Van Lommel
93aa83f0a3 Fix #31518: changing cycles exposure did unnecessary rerender in viewport. 2012-05-18 14:06:53 +00:00
Brecht Van Lommel
3e83fd441d Fix #31486: cycles texture coordinate reflection output has wrong direction. 2012-05-18 12:49:22 +00:00
Peter Larabell
892888ec64 Adds basic curves with holes support for multi-spline mask curves. 2012-05-17 15:52:56 +00:00
Campbell Barton
09bb37fe93 svn merge ^/trunk/blender -r46684:46699 2012-05-16 16:41:51 +00:00
Bastien Montagne
2e89e0096a Spell check fix (lenght -> length) 
Note: two remains, in comments in extern/bullet2/src/LinearMath/btVector3.h and extern/libmv/libmv/image/tuple.h.
 2012-05-16 14:25:25 +00:00
Campbell Barton
d82ca6d636 svn merge ^/trunk/blender -r46632:46684 2012-05-16 09:12:18 +00:00
Sergey Sharybin
7b31c3c198 Fix cosmetic typos 
Patch provided by Matteo F. Vescovi, thanks!
 2012-05-15 16:11:04 +00:00
Daniel Genrich
d8ae4b35f2 Patch [#31264] Elbeem Fixes by Jason Wilkins. 
Thank you for submitting!
 2012-05-14 16:19:58 +00:00
Campbell Barton
060282ea42 svn merge ^/trunk/blender -r46612:46629 2012-05-14 13:55:12 +00:00
Sergey Sharybin
a7a79322bf Make blender compilable by gcc-4.7 and strict compilation flags: 
- Remove strict flags from files, which are using FFmpeg stuff
  We're still using some symbols which are marked as deprecated.
  Ideally, we shall switch to new API, but it's a bit larger challenge
  because we don't want to break compatibility withotu actual need.
- Replace MAKE_ID with BT_MAKE_ID in bullet library.
  This is needed to prevent re-definition of MAKE_ID in bullet library.
  Seems it's only used to read blender files, so should be quite safe
  change.
 2012-05-14 13:31:38 +00:00
Campbell Barton
cf6450256d style cleanup: comments and whitespace 2012-05-13 21:46:18 +00:00
Campbell Barton
ee9d9f4737 style cleanup: mask, whitespace edits, also use len_squared_v2 for comparisons. 2012-05-13 21:36:42 +00:00
Campbell Barton
2a3fddf5b3 svn merge: Merging r46558 through r46612, from trunk 2012-05-13 18:16:25 +00:00
Brecht Van Lommel
dd9c1b7fbf Cycles: OpenCL image texture support, fix an attribute node issue and refactor 
feature enabling #defines a bit.
 2012-05-13 12:32:44 +00:00
Sergey Sharybin
4359564d9b Merging r46495 through r46557 from trunk into soc-2011-tomato 2012-05-11 17:39:57 +00:00
Campbell Barton
3bbfbfe4b1 dont use sdl include when building headless 2012-05-11 14:17:49 +00:00
Brecht Van Lommel
8148d7b1df Cycles: reviewed the task scheduler code and fixed (hopefully all) windows threading problems. 2012-05-10 22:31:16 +00:00
Brecht Van Lommel
072a882d03 Fix #31379: cycles not recognizing 16 bit tiff as float image. 2012-05-10 17:09:36 +00:00
Sergey Sharybin
5c705a3f33 Merging r46469 through r46494 from trunk into soc-2011-tomato 2012-05-10 11:20:15 +00:00
Nicholas Bishop
10d1cde0ad Potential fix for bug #31111, Remesh modifier generates artifacts on simple surfaces 
Changed one of the intersection tests to use < rather than <=

The sharp and smooth modes look fine now for the special case that was
reported broken; blocks mode looks correct but "jumps" slightly from
one octree resolution to another, so may need additional corrections.
 2012-05-10 05:13:10 +00:00
Nicholas Bishop
3d65c502e1 More code cleanup in intern/dualcon. 
Removed a lot of unused code, added comments and some clearer
naming. Minor code shuffles and style cleanup too.
 2012-05-10 05:12:58 +00:00
Sergey Sharybin
78f3d31cfd Merging r46414 through r46455 from trunk into soc-2011-tomato 2012-05-09 09:41:27 +00:00
Brecht Van Lommel
c8cbe63947 Cycles: fix issues with texture coordinates and object scale. Auto texture 
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.
 2012-05-08 23:39:31 +00:00
Nicholas Bishop
d93a935965 Fix division by zero case in dualcon. 2012-05-08 22:11:16 +00:00
Nicholas Bishop
56342f222f Code style cleanup in intern/dualcon. 2012-05-08 22:11:05 +00:00
Brecht Van Lommel
d9a70ceeb1 Fix 31370: light falloff node linear output not working code. 
Fix part of thread safety issue, there's still something else wrong.
 2012-05-08 19:57:56 +00:00
Sergey Sharybin
16d93f3881 Merging r46203 through r46413 from trunk into soc-2011-tomato 2012-05-08 13:01:16 +00:00
Mike Erwin
243304a623 ndof: restored support for older serial port 3D mice on Linux (R45951 broke it, oops) 2012-05-08 05:04:29 +00:00
Dalai Felinto
5797edfcf2 adding kernel_projection.h in CMakelists 2012-05-07 20:37:48 +00:00
Brecht Van Lommel
e6a84eb1b5 Cycles: add light falloff node, with quadratic/linear/constant falloff and a 
smoothing factor to reduce high values near the light.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Light_Falloff

Note that this was already possible to do manually with the Ray Length, but
this adds a convenient node for it. This commit also makes the mapping node
min/max option work, fixing #31348.
 2012-05-07 20:24:38 +00:00
Dalai Felinto
e11b9df3f1 cycles-fisheye: fixed formula for dir to equisolid 
second time I need a scond commit to get the equisolid formula right, shame on me ;)
the formula is:
r = 2 x focallength x sin (theta / 2)
 2012-05-07 17:22:13 +00:00
Dalai Felinto
9a731205e9 direction to equisolid - final fix for [#31307] Cycles panoramic fisheye lens and vector pass problem 2012-05-07 16:51:55 +00:00
Bastien Montagne
4bbcb7714e Some misc fixes to UI messages... 2012-05-07 15:50:57 +00:00
Brecht Van Lommel
b613879f34 GHOST/Cocoa: revert tablet detection commit for continuous grab, apparently it is 
already doing it and this change breaks something? Still it seems strange that it
is doing tablet stuff in this part of the code then.
 2012-05-07 13:42:25 +00:00
Brecht Van Lommel
97df6dab2f GHOST/Cocoa: detect tablet event to disable continuous grab. Don't have tablet 
to test it though, can someone with Mac + tablet confirm if continuous grab
gets automatically disabled when using the tablet?
 2012-05-07 10:53:12 +00:00
Brecht Van Lommel
022d12a721 Fix most of #31307: cycles panorama camera not working correct with speed 
vectors and window texture coordinates. Only for Fisheye Equisolid it's
still not working correct yet. Patch from Dalai with modifications.
 2012-05-07 10:53:09 +00:00