griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,565 Commits 1 Branch 0 Tags
310b25c388aeaf43eeb4b0e4895cc5a24e44cd8e
Commit Graph

1710 Commits

Author SHA1 Message Date
Brecht Van Lommel
310b25c388 Cycles: code refactoring to split out code from mapping node. 2011-10-12 22:42:13 +00:00
Brecht Van Lommel
4c3b94fdbd Cycles: image texture node now uses UV as default texture coordinate, 
instead of generated.
 2011-10-12 16:01:37 +00:00
Brecht Van Lommel
c3c44f8736 Cycles: don't use glsl in textured draw mode, to keep things simpler and faster 
there for now. Also add viewport color setting for materials for solid draw mode.
 2011-10-12 15:48:26 +00:00
Brecht Van Lommel
9ec1114765 Cycles: make node with multiple input sockets with the same name work. Previously 
nodes like Mix had their sockets renamed to Color1/Color2, but doing this breaks
compatibility for the internal renderer, so restored it now.
 2011-10-12 15:45:52 +00:00
Brecht Van Lommel
7503a7edfb Cycles: replace surface/volume sockets in output nodes with a single shader socket, 
decided it's better to render objects as either surface or volume.

This may break the volume rendering patch, but shaders with volume closures still
get tagged as having volume closures, so it should be fixable without too many
changes.
 2011-10-12 15:42:35 +00:00
Brecht Van Lommel
85818c8209 Cycles: add python render engine option to use new shading nodes or not, instead 
of hardcoded check for cycles. Also some other minor code cleaning tweaks.
 2011-10-11 17:19:55 +00:00
Brecht Van Lommel
4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +00:00
Joerg Mueller
9cabc57a62 Sequencer audio waveform drawing fix, now assured to be within the strip bounds. 2011-10-10 14:59:13 +00:00
Campbell Barton
f9ea19ac12 spaces -> tabs (only whitespace changes) 2011-10-06 22:02:50 +00:00
Campbell Barton
38221fa8e6 set mikktspace functions as static which are not used externally. 2011-10-06 11:40:49 +00:00
Campbell Barton
ce1ac3412d dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed). 
this should stay disabled until scons supports system/portable installs as with cmake.
 2011-10-06 02:29:15 +00:00
Jens Verwiebe
39300a5079 OSX: Correct copy/paste error and exclude endianess switch from darwin 2011-10-05 08:58:32 +00:00
Brecht Van Lommel
1ab9fc59b7 Cycles: fix a few more msvc issues with empty scenes and ustring setting. 2011-10-03 17:42:24 +00:00
Brecht Van Lommel
da8f71bffb Cycles: some tweaks to silence msvc assertions in debug mode. 2011-10-03 15:31:45 +00:00
Joerg Mueller
4bafd13eaf Missed some stoff when removing libsamplerate. 2011-10-02 18:08:16 +00:00
Nathan Letwory
1714d1cfe2 Typo fix. nexYon commit caused bit-loss in the word incs. 2011-10-02 17:58:21 +00:00
Joerg Mueller
07ad83a439 * Removing libsamplerate from build systems 
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
 2011-10-02 17:09:39 +00:00
Jens Verwiebe
b05a3f7e42 Cgange compile cindition for gcc-4.6-objC++ workaround 2011-09-30 20:26:14 +00:00
Brecht Van Lommel
9520295ade Fix #28416: setting fluid simulation start time to anything other than zero 
gave wrong results. Note how in this code it already incremented to the start
time and then incorrectly added it again. Patch by Chris Foster, thanks!
 2011-09-29 14:18:01 +00:00
Jens Verwiebe
47ca7e23c0 Now in proper english, hehe 2011-09-28 17:52:07 +00:00
Jens Verwiebe
ce714341b9 Using non ASCII-conform char in comment broke compile 2011-09-28 17:45:32 +00:00
Jens Verwiebe
6088d460ef OSX: Give clear commenting and more up-to-date defaults 2011-09-28 17:28:37 +00:00
Jens Verwiebe
416885aad4 OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers 2011-09-28 17:15:28 +00:00
Joerg Mueller
c2323749ff Bugfix for wrong playback reported by Sergey Sharybin in IRC. 2011-09-28 09:37:50 +00:00
Thomas Dinges
e6dfbcf7cb Cycles: 
* Typo Fix.
 2011-09-27 21:05:33 +00:00
Brecht Van Lommel
cdee3435c6 Cycles: internal changes that should have no effect on user level yet, added 
shader flags for various purposes, and some code for light types other than
points.
 2011-09-27 20:37:24 +00:00
Brecht Van Lommel
136d27b350 Cycles: add some volume nodes, they don't actually do anything, this is just 
to give other developers who may want to work on this to get a starting point.
 2011-09-27 20:03:16 +00:00
Brecht Van Lommel
f5b60afe4e Cycles: fix error in md5 hash computation for files in directories below 
the first level.
 2011-09-27 19:35:41 +00:00
Jens Verwiebe
6f2d937a63 OSX: introduced a workaround for compiling with non-apple gcc-4.6.1, ghost must be compiled with apple-gcc nevertheless due objc incompatibilities 2011-09-27 13:18:34 +00:00
Campbell Barton
e4c299d975 comment warnings as errors for MSVC - it too easily made small problems like unused vars into errors which gets annoying for non developers. 
with GCC we have *some* warnings as errors which works out better.
 2011-09-27 12:08:35 +00:00
Campbell Barton
928e2784c6 py api 
- use Py_ssize_t when dealing with python sequence sizes
- dont call PySequence_Size(py_b) in a loop (its slow).
- use faster sequence/float parsing in aud.Factory.filter
 2011-09-27 05:28:06 +00:00
Sergey Sharybin
3be50219fd Abort on guarded memory manager errors if WITH_ASSERT_ABORT is set 2011-09-26 14:21:40 +00:00
Daniel Salazar
7ff634b8ef Reverting change to solver_relax.h from commit 40539, caused this nasty bug http://projects.blender.org/tracker/?func=detail&atid=498&aid=28748&group_id=9 
I'd say better be careful with code so complex as the fluid sim!
 2011-09-26 09:36:51 +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
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Campbell Barton
f260a878e4 give a more useful error when building with an old ffmpeg. 2011-09-25 04:17:00 +00:00
Jens Verwiebe
a7891da84b Fix fluid openMP not baking with some threadcounts 2011-09-23 09:26:03 +00:00
Brecht Van Lommel
508bfebf36 Cycles: another bugfix for mix closure sampling + bump. 2011-09-21 11:54:28 +00:00
Campbell Barton
4b449aefea remove support for irix 2011-09-21 08:40:30 +00:00
Brecht Van Lommel
a2c6db0b44 Cycles: svn merge -r40358:40411 ^/trunk/blender 2011-09-20 18:48:28 +00:00
Campbell Barton
8f5112f191 pep8 update & some minor cmake edits. 2011-09-20 18:29:19 +00:00
Campbell Barton
84d06f252e tag & comment unused vars with /* UNUSED */ 2011-09-20 08:48:48 +00:00
Brecht Van Lommel
153e4cad4b Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-19 14:20:15 +00:00
Brecht Van Lommel
e9b967d05b Cycles: remove deprecated strict aliasing flag for opencl, fix missing update 
modifying object layer in properties editor, and add memarena utility.
 2011-09-19 11:57:31 +00:00
Campbell Barton
83a2f02a78 cleanup endian handling 
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
 2011-09-19 08:02:17 +00:00
Campbell Barton
507aa1cd22 fix for crash loading a file saved with fluidsim when blenders compiled with it disabled. 
also remove unneed class prefix on function name for itasc.
 2011-09-18 11:08:34 +00:00
Campbell Barton
08d52fcc85 added FindOpenImageIO cmake module. 2011-09-18 04:55:22 +00:00
Brecht Van Lommel
f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender 
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
 2011-09-17 13:28:40 +00:00
Brecht Van Lommel
66b1dfae89 Cycles: tweaks to properties and nodes 
* Passes renamed to samples
* Camera lens radius renamed to aperature size/blades/rotation
* Glass and fresnel nodes input is now index of refraction
* Glossy and velvet fresnel socket removed
* Mix/add closure node renamed to mix/add shader node
* Blend weight node added for shader mixing weights

There is some version patching code for reading existing files, but it's not
perfect, so shaders may work a bit different.
 2011-09-16 13:14:02 +00:00
Brecht Van Lommel
0a5fcf3da3 Cycles: fix issue with mix shaders, leading to use of uninitialized memory. 2011-09-16 13:00:09 +00:00