Commit Graph

4909 Commits

Author SHA1 Message Date
Dalai Felinto
4db4a0933f SeparateRGB and CombineRGB nodes for Cycles materials
reviewed and approved by Brecht

my first OpenCL code \o/
2011-12-01 21:46:10 +00:00
45de380771 Cycles
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
  more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
25098c741b svn merge ^/trunk/blender -r42292:42303 2011-12-01 00:34:59 +00:00
b6021462a8 Another possible fix for #29301: issue with BVH intersection, reorder code a
bit so that it's more symmetric and resulting float ops are compiled the same
way. Otherwise extended float precision being used in one place and not the
other can make comparisons fail.
2011-11-30 16:29:26 +00:00
faa022563d svn merge ^/trunk/blender -r42245:42261 2011-11-29 18:18:56 +00:00
f62ad8f69b remove header text:
"The Blender Foundation also sells licenses for use in proprietary software under the Blender Licens"

also remove NaN references from files that have been added since blender went opensource.
2011-11-29 10:54:47 +00:00
3bccd1ffed svn merge ^/trunk/blender -r42182:42194 2011-11-27 21:18:59 +00:00
42d50c75fa minor cycles edits
- use sets rather then tuples
- use relative imports
2011-11-27 03:49:09 +00:00
30b6dacb4b Enable building cycles in bmesh branch
This change adds RNA access to tesselated face UVs and colors (MTFACE and MCOL), primarily for use by plugin renderers (e.g. cycles). The RNA mesh properties to get to these are prefixed with "tessface_" and additionally the help text states that these are for renderers, to try not to confuse existing mesh editing tool scripts into thinking they could just start using these values.
2011-11-25 13:28:04 +00:00
04d1971a66 Fix cycles python error introduced in revision 42138. 2011-11-24 21:14:48 +00:00
4b3976cc5a svn merge ^/trunk/blender -r42116:42139 2011-11-24 20:01:45 +00:00
6e28ac2d7b pep8 edits and avoid naming conflicts with python builtins 2011-11-24 19:36:12 +00:00
366554d303 Scons / Cycles:
* Add dummy WITH_BF_CYCLES_BINARIES to scons, to be able to copy the .cubin kernels from cmake and have it work.
2011-11-24 19:22:34 +00:00
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
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
74c6c91ba6 svn merge ^/trunk/blender -r42080:42095 2011-11-23 17:14:27 +00:00
92ec286752 Cycles: build flags tweaks to avoid errors with msvc debug build. 2011-11-23 16:30:50 +00:00
4c43a14b9f OSX: Fix more UTF8 issues, todo: use correct font 2011-11-23 07:39:59 +00:00
086e4ed825 Cycles: improve error reporting for opencl and cuda, showing error messages in
viewport instead of only console.
2011-11-22 20:49:33 +00:00
ac814498a2 svn merge ^/trunk/blender -r42069:42076 2011-11-22 18:15:08 +00:00
eb2baf9abc Fix #29274: problem compiling cycles opencl kernel from directory with spaces.
Some drivers don't support passing include paths with spaces in them, nor does
the opencl spec specify anything about how to quote/escape such paths, so for
now we just resolved #includes ourselves. Alternative would have been to use c
preprocessor, but this also resolves all #ifdefs, which we do not want.
2011-11-22 16:38:58 +00:00
c6391e8d23 svn merge ^/trunk/blender -r42053:42069 2011-11-22 15:33:44 +00:00
47853bf6f6 Cycles: OpenCL tweaks
* Reduce kernel arguments size, helps compile for apple nvidia.
* Fix use of unitialized variable in displace kernel.
* Use build flags in opencl kernel md5 hash.
* Reorganize code for kernel feature #defines a bit.
2011-11-22 13:15:19 +00:00
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
6f73e351ee Cycles:
* Fix #29354: crash on branch file. Note that for best compatibility, you need
  to save your files with one of the latest branch builds, since not all version
  patching code was moved to trunk.
* Rename "Cycles" to "Cycles Render" in info header menu.
* Code tweaks to try to fix #29301. It's not a real solution though, I'm thinking
  cause is extended precision for floats on some cpu's, used in one case but not
  in the other, leading to bounding box intersection issue...
2011-11-21 16:28:19 +00:00
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
2b1f800e9e Bugfix for [#29279] Cycles Displacement Panel appears when blender render engine is choosen. 2011-11-19 22:59:48 +00:00
384ec1769b Cycles: another build system tweak that might solve build problem, not sure
why this code is giving issues.
2011-11-19 22:06:39 +00:00
c26c5f3852 UI: small tweak to tooltips for enum menus, it wasn't very clear which
description was for the property and which for the item.
2011-11-18 21:06:36 +00:00
02ce6fd59c Cycles: try to avoid NaN pixels with oren nayar. Also small cmake code cleanup. 2011-11-18 15:39:40 +00:00
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
4d9766aacf minor cleanup
- remove / comment unused python vars
- replace mul_v3_fl(somevec, -1.0f); with negate_v3(somevec);
2011-11-16 16:38:37 +00:00
0566694f6e Cycles: cmake build system tweak, might solve compile issue. 2011-11-16 16:28:19 +00:00
b4d453212a Fix #29292: cycles not loading linked image datablocks correctly. 2011-11-16 16:10:11 +00:00
c00c0134e0 svn merge -r41847:41899 ^/trunk/blender 2011-11-16 03:10:15 +00:00
63ff37c6d4 Fix #29278: cycles crash with displacement method both. 2011-11-15 22:09:30 +00:00
bff59a5b2e OSX: buildfix for itask on 10.5.sdk 2011-11-15 21:55:07 +00:00
4f743dd0cc SVN maintenance. 2011-11-15 19:37:09 +00:00
ef6eab3ce4 Cycles: move clew into cycles namespace to avoid conflicts, and fix mesh
displacement panel showing with blender internal.
2011-11-15 19:23:35 +00:00
e78cad5540 Fix build issue on windows, M_PI => M_PI_F. 2011-11-15 18:01:52 +00:00
db8024f4b5 Fix #29259: cycles issues on certain processors. Now two versions of the kernel
are compiled, one SSE optimized and the other not, and it will choose between
them at runtime.
2011-11-15 15:13:38 +00:00
e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender 2011-11-15 02:58:06 +00:00
747f06d3d2 set cycles scripts as pep8 & make some minor changes.
also update sphinx doc generator.
2011-11-15 02:58:01 +00:00
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
3442c16c09 Fix #29249: mapping node not keyable anymore, restore RNA to what it was before
Cycles change, generating RNA paths for this is a bit complicated.
2011-11-14 20:39:53 +00:00
2ab2423b06 Cycles:
* Fix #29257: nan-pixels with zero roughness for glass/glossy.
* Fix #29239: crash with border rendering, this is not working yet, but should
  no longer crash now.
* Show object name in 3d view rendered draw type.
* Attempt to improve Sample as Light option description.
2011-11-14 19:45:21 +00:00
ff82aa8677 Fix for uninitialized usage of spos in AUD_LinearResampleReader::read
Patch is verified by neXyon
2011-11-14 19:44:49 +00:00
21fa7e0b86 Some UI messages fixes and tweaks in recent merges (found while translating in french). 2011-11-14 19:13:52 +00:00
e731ffb648 Cycles: Oren-Nayar BSDF support. This is not a separate shader node, rather it
is available through the Roughness input on the Diffuse BSDF.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Diffuse

Patch by Yasuhiro Fujii, thanks!
2011-11-14 17:31:47 +00:00
393c7b2e93 OSX: go back to former zoombehaviour with magicmouse in Lion, no time to recode to NSTouch in the near time 2011-11-13 13:25:22 +00:00