sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
44,568 Commits 2 Branches 0 Tags 753 MiB
1647725913
Commit Graph

109 Commits

Author SHA1 Message Date
Campbell Barton
9d4be17de4 style cleanup 2013-02-04 00:05:15 +00:00
Campbell Barton
c2839bfe76 add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system. 
Note: this doesn't work yet for everything with latest stable bullet (2.81), need to look into why and likely apply some patches upstream.
However I managed to link blender by disabling some features, likely it can be made to work without too much trouble.
 2013-01-03 00:23:52 +00:00
Bastien Montagne
ab2c273b12 Added GPL header to sconscripts! 
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
 2012-12-17 08:01:43 +00:00
Miika Hamalainen
8b477463d1 Fix #33411: Smoke simulator using uninitialized noise tile 
If loading an existing FFT noise tile failed the tile in memory was left uninitialized.
 2012-12-05 17:58:24 +00:00
Brecht Van Lommel
2b962212c8 Fix #33411: crash baking smoke with FFT high resolution. 
CMake had FFTW disabled by default, and when FFTW was not enabled it lead to
uninitialized memory usage. Now it falls back to wavelet if there is no FFTW,
and I've enabled it by default in CMake. If it's not found on Linux it will get
disabled automatically.
 2012-12-05 15:46:31 +00:00
Campbell Barton
db8b7fcabb style cleanup and correct own invalid comment. 2012-10-31 11:45:41 +00:00
Campbell Barton
c93978d445 code cleanup: some edits for unused vars in recent smooth addition and some style edits. 2012-10-24 11:31:57 +00:00
Campbell Barton
bc8f602601 style cleanup 2012-10-20 18:46:57 +00:00
Daniel Genrich
c9fdf6e496 Smoke: Animated collision objects do no longer block smoke. Smoke gets transfered velocity from moving collision object. 
Result:
http://www.youtube.com/watch?v=KRtc8eAgaZA

Part of my Blender Development Project Phase III, merged from Smoke2 branch

WIP docs:
http://wiki.blender.org/index.php/User:Genscher/Smoke_Development_Project_2012
 2012-10-16 17:01:22 +00:00
Daniel Genrich
8a25e2d2b2 Smoke: Merge parts of Smoke2 branch 
New:
----------
Collision objects do cause vorticity when passing through smoke

Part of my Smoke Development Project (milestone III)
 2012-10-15 19:57:18 +00:00
Sergey Sharybin
c5300c638c Solve some issues with smoke when using strict compile flags 
- Mark some functions as static
- ifdef-ed currently unused functions from spectrum.cpp
- Fixed missing prototype for smectrum() function
 2012-10-15 09:25:03 +00:00
Campbell Barton
3a947cf537 code cleanup: remove redundant casts 2012-10-14 08:49:01 +00:00
Daniel Genrich
cb634b9100 Google Summer of Code project: "Smoke Simulator Improvements & Fire". 
Documentation & Test blend files:
------------------
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2012-Smoke-Simulator-Improvements

Credits:
------------------
Miika Hamalainen (MiikaH): Student / Main programmer

Daniel Genrich (Genscher): Mentor / Programmer of merged patches from Smoke2 branch
Google: For Google Summer of Code 2012
 2012-10-10 13:18:07 +00:00
Campbell Barton
d724d0adfe code cleanup: quiet warnings for gcc's -Wundef, -Wmissing-declarations 2012-09-16 00:26:36 +00:00
Daniel Genrich
a1dd6ea836 Smoke: High res on even resolution did not write to all cells (downsampling = n-1, upsampling = n). 
Thanks goes to MiikaH.
 2012-08-10 09:58:58 +00:00
Daniel Genrich
8a0f6aa2f2 Bugfix: High resolution "exploded" when using uneven resolutions, sometimes with specific object scaling. 
Part of Smoke Development Phase III.

Credit also goes to MiikaH: It was a teamwork effort and took days to track down. :)
 2012-08-01 20:29:37 +00:00
Campbell Barton
32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
Campbell Barton
ff9a4e445e fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading. 2012-07-03 06:45:43 +00:00
Daniel Genrich
a0c6371b7f Smoke Bugfix: Turbulence was removed. 2012-07-02 13:41:51 +00:00
Daniel Genrich
9f7af5ef7e Bugfix for wrong / bad vorticity forming weird banding on the y and z axis. 
Part of Blender Smoke Develeopment Milestone III.
 2012-07-02 12:55:23 +00:00
Campbell Barton
9c504f6db2 correct freeing C++ arrays. 2012-06-10 20:14:15 +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
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
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
Daniel Genrich
796dd8a321 Fix compile error with msvc 2012-04-30 11:27:06 +00:00
Daniel Genrich
8bf8a128c2 Smoke: Support for moving obstacles. (Merge from Smoke2 branch) 
Sponsored by the Blender Development Fund.
http://www.blender.org/blenderorg/blender-foundation/development-fund/

Remarks:
The original code was not designed to support moving obstacles so I had to introduce some velocity constraints into the code to prevent smoke from exploding. If this causes problems with "fire" emulation, please let me know.
 2012-04-28 21:46:43 +00:00
Daniel Genrich
be674afdad Bugfix (missed one code line): Copy paste induced bug found by Sv. Lockal. 
Thank you for pointing this out!
 2012-02-19 21:15:12 +00:00
Daniel Genrich
49b1d14aee Bugfix: Copy paste induced bug found by Sv. Lockal. 
Thank you for pointing this out!
 2012-02-19 20:59:46 +00:00
Campbell Barton
6d965f4493 style edits for function declarations 2011-12-30 07:55:15 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Andrew Wiggin
7c46f1c4b7 Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h) 2011-09-25 12:33:51 +00:00
Campbell Barton
84d06f252e tag & comment unused vars with /* UNUSED */ 2011-09-20 08:48:48 +00:00
Campbell Barton
bf5a6531a6 replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3' 2011-09-05 23:46:08 +00:00
Campbell Barton
410c5e3cd2 cmake source definitions: 
remove missing includes and use more strict formatting.
 2011-07-16 23:01:14 +00:00
Campbell Barton
1fd33b6e77 cmake option to build without smoke sim: WITH_MOD_SMOKE 2011-07-13 18:40:21 +00:00
Nathan Letwory
c78cee8e27 Fix compile for msvc (broken in r38119) 2011-07-05 14:53:37 +00:00
Brecht Van Lommel
ccd31900ab Fix #27855: crash on enabling high resolution smoke. 
Wavelet tile generation code was reading outside of array bounds, and as a
result could give a noise.wavelets file with nan values. Now that problem
is fixed, and existing files with nan are ignored.
 2011-07-05 12:25:56 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
09da9d4393 cmake maintenance 
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
 2011-05-31 01:15:44 +00:00
Nathan Letwory
14c3714b81 Revert rename of r36578, breaks scons compile. 2011-05-09 21:34:52 +00:00
Guillermo S. Romero
c87b5f8dfb SVN maintenance. 2011-05-09 20:13:48 +00:00
Campbell Barton
4c71d9efb5 set svn end of lines to native 2011-05-09 08:15:38 +00:00
Nathan Letwory
b8e7f89003 doxygen: intern/smoke tagged. 2011-02-25 11:50:46 +00:00
Campbell Barton
92672d0c1c quiet some clang warnings. 2011-02-12 05:12:26 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Campbell Barton
1bd0db59f4 use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken. 
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
 2011-01-25 14:43:13 +00:00
Campbell Barton
5e382eb8e5 rename blenderlib to blender_add_lib 2010-12-22 23:09:30 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Campbell Barton
e8397e6193 include headers in cmake source, added a script to check for consistency, reporting missing headers & C files. 
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
 2010-11-29 04:35:56 +00:00
Campbell Barton
78cd971bac - smoke wasn't closing the file of loading a tile had the wrong length. 
- missing break in operator context switch meant RGN_TYPE_CHANNELS was always being overwritten with RGN_TYPE_PREVIEW when calling operators (from r26692)
 2010-11-20 07:51:39 +00:00