griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,941 Commits 1 Branch 0 Tags
0451dedf6f1838aebe8dbc8205aa2b110fcefe89
Commit Graph

2340 Commits

Author SHA1 Message Date
Campbell Barton
998c34a7fa minor cleanup 2012-05-31 09:50:50 +00:00
Campbell Barton
1308cad234 patch from pete larabell - feather support for masking. 2012-05-31 08:39:22 +00:00
Campbell Barton
d74200a3af svn merge -r47246:47245 . --- revert 47246, this needs more considersation and planning to do this well 2012-05-31 08:24:53 +00:00
Campbell Barton
0ce5dd7e3f svn merge ^/trunk/blender -r47229:47253 2012-05-31 07:57:04 +00:00
Peter Larabell
3795d73235 Adds property to mask splines to allow them to be negated (black masks), still needs work in tracking.c 2012-05-30 21:15:17 +00:00
Peter Larabell
6f64165b95 Mask out of bounds fix for mask rasterizer 2012-05-30 18:39:42 +00:00
Campbell Barton
b3bc5edffc replaced last instance of BF_GHOST_DEBUG 2012-05-30 17:14:55 +00:00
Lukas Toenne
0e9b0f6d9e Fix #31645, mix node results in crash upon render. This happens when unused mix nodes are removed from the cycles graph. In case the inputs are both unconnected it still tried to reconnect them. 2012-05-30 15:47:12 +00:00
Campbell Barton
1116731d97 make rasterizer thread safe. 2012-05-30 10:24:34 +00:00
Campbell Barton
7d04e4c53e svn merge ^/trunk/blender -r47150:47184 2012-05-29 15:02:21 +00:00
Brecht Van Lommel
9e2f377273 Fix #31556: cycles object info random value was not properly randomized for 
dupligroups.
 2012-05-29 10:34:16 +00:00
Sergey Sharybin
df8880a81f Fix compilation error of Cycles after recent py node removal 2012-05-29 09:51:16 +00:00
Campbell Barton
b6a28065c9 svn merge ^/trunk/blender -r47103:47150 2012-05-29 05:48:07 +00:00
Thomas Dinges
a7c68afc72 Cycles / CUDA: 
* Remove double declaration of cosf.
 2012-05-28 23:51:06 +00:00
Thomas Dinges
d3c6c6babd Cycles / CUDA: 
* Remove -use_fast_math flag from scons as well.
 2012-05-28 19:49:26 +00:00
Brecht Van Lommel
131de4352b Cycles: fixes to make CUDA 4.2 work, compiling gave errors in shadows and 
other places, was mainly due to instancing not working, but also found
issues in procedural textures.

The problem was with --use_fast_math, this seems to now have way lower
precision for some operations. Disabled this flag and selectively use
fast math functions. Did not find performance regression on GTX 460 after
doing this.
 2012-05-28 19:21:13 +00:00
Thomas Dinges
04c30c5efb Scons / MSVC - Windows x64 
* SSE/SSE2 is an unknown option for the compiler (Command line warning D9002 : ignoring unknown option '/arch:SSE2'), so it can be left out because on x64 it automatically builds with SSE and SSE2.
 2012-05-28 09:20:04 +00:00
Campbell Barton
daa8fe9145 svn merge ^/trunk/blender -r47070:47099 2012-05-28 04:48:42 +00:00
Campbell Barton
b33f0ef0e3 style cleanup 2012-05-27 19:40:36 +00:00
Daniel Genrich
1e13168183 Smoke: 
a) Another boundary fix. Resulted in smoke getting "sucked" back into the domain
b) Disabling substeps (internal thing). Fixes arbitrary explosions/instabilities.

Part of my Blender Smoke Development.
 2012-05-27 18:45:16 +00:00
Campbell Barton
e9fe7e7ff7 svn merge ^/trunk/blender -r47067:47070 2012-05-27 12:23:20 +00:00
Campbell Barton
2ab62ce126 code cleanup: defines with braces - end with '(void)0' so callers must end with ';' like normal function. 
... without this some editors dont parse the source so well.
 2012-05-27 12:21:13 +00:00
Campbell Barton
d80333c2ad svn merge ^/trunk/blender -r47058:47067 2012-05-27 11:12:29 +00:00
Campbell Barton
857dedbc58 style cleanup 2012-05-27 00:36:50 +00:00
Campbell Barton
dd77076f62 svn merge ^/trunk/blender -r47047:47058 2012-05-26 22:31:28 +00:00
Miika Hamalainen
eda0f3b186 Fix for smoke boundary conditions: "Open borders" behaved differently for positive and negative axises. 
+ Some code cleanup.
 2012-05-26 21:36:19 +00:00
Campbell Barton
8c89d52614 svn merge ^/trunk/blender -r47003:47047 2012-05-26 14:19:41 +00:00
Campbell Barton
76599a4989 update python script memory printout to python3 and some style cleanup 2012-05-26 13:59:34 +00:00
Campbell Barton
88e646b0d4 style cleanup: our own malloc code 2012-05-26 13:36:12 +00:00
Campbell Barton
ed98de3398 code cleanup: dutch -> english (comments) 2012-05-26 13:31:57 +00:00
Brecht Van Lommel
942fcf4415 Unix: enable use of XDG paths for storing Blender configuration on Linux/BSD/.., 
starting from version 2.64. Unless you have a special system setup, this means the
will be in ~/.config/blender rather than ~/.blender.

When the version number is changed to 2.64, the "Copy Previous Settings" operator
in the splash will copy the settings to the new location.

XDG base directory specification:
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 2012-05-25 12:08:29 +00:00
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