griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

6295 Commits

Author SHA1 Message Date
Brecht Van Lommel
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
Campbell Barton
74c6c91ba6 svn merge ^/trunk/blender -r42080:42095 2011-11-23 17:14:27 +00:00
Brecht Van Lommel
92ec286752 Cycles: build flags tweaks to avoid errors with msvc debug build. 2011-11-23 16:30:50 +00:00
Jens Verwiebe
4c43a14b9f OSX: Fix more UTF8 issues, todo: use correct font 2011-11-23 07:39:59 +00:00
Brecht Van Lommel
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
Campbell Barton
ac814498a2 svn merge ^/trunk/blender -r42069:42076 2011-11-22 18:15:08 +00:00
Brecht Van Lommel
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
Campbell Barton
c6391e8d23 svn merge ^/trunk/blender -r42053:42069 2011-11-22 15:33:44 +00:00
Brecht Van Lommel
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
Campbell Barton
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
Brecht Van Lommel
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
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
Thomas Dinges
2b1f800e9e Bugfix for [#29279] Cycles Displacement Panel appears when blender render engine is choosen. 2011-11-19 22:59:48 +00:00
Brecht Van Lommel
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
Brecht Van Lommel
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
Brecht Van Lommel
02ce6fd59c Cycles: try to avoid NaN pixels with oren nayar. Also small cmake code cleanup. 2011-11-18 15:39:40 +00:00
Campbell Barton
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
Campbell Barton
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
Brecht Van Lommel
0566694f6e Cycles: cmake build system tweak, might solve compile issue. 2011-11-16 16:28:19 +00:00
Brecht Van Lommel
b4d453212a Fix #29292: cycles not loading linked image datablocks correctly. 2011-11-16 16:10:11 +00:00
Campbell Barton
c00c0134e0 svn merge -r41847:41899 ^/trunk/blender 2011-11-16 03:10:15 +00:00
Brecht Van Lommel
63ff37c6d4 Fix #29278: cycles crash with displacement method both. 2011-11-15 22:09:30 +00:00
Jens Verwiebe
bff59a5b2e OSX: buildfix for itask on 10.5.sdk 2011-11-15 21:55:07 +00:00
Guillermo S. Romero
4f743dd0cc SVN maintenance. 2011-11-15 19:37:09 +00:00
Brecht Van Lommel
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
Brecht Van Lommel
e78cad5540 Fix build issue on windows, M_PI => M_PI_F. 2011-11-15 18:01:52 +00:00
Brecht Van Lommel
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
Campbell Barton
e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender 2011-11-15 02:58:06 +00:00
Campbell Barton
747f06d3d2 set cycles scripts as pep8 & make some minor changes. 
also update sphinx doc generator.
 2011-11-15 02:58:01 +00:00
Campbell Barton
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
Brecht Van Lommel
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
Brecht Van Lommel
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
Sergey Sharybin
ff82aa8677 Fix for uninitialized usage of spos in AUD_LinearResampleReader::read 
Patch is verified by neXyon
 2011-11-14 19:44:49 +00:00
Bastien Montagne
21fa7e0b86 Some UI messages fixes and tweaks in recent merges (found while translating in french). 2011-11-14 19:13:52 +00:00
Brecht Van Lommel
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
Jens Verwiebe
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
Brecht Van Lommel
b5a57b193d Fix #29041: parenting problem with tree IK for iTaSC and iksolver, where it 
would use the wrong bone as parent on brancing. Patch by Juha Maki-Kanto.
 2011-11-13 13:08:15 +00:00
Brecht Van Lommel
d0550758af Fix #29048: iTaSC solver crash on certain compilers/platforms, due to memory 
alignment issues with Eigen. Patch by Tobias Oelgarte.
 2011-11-13 12:25:14 +00:00
Thomas Dinges
b1019a56b5 Cycles: 
* Typo fix, patch by David on the mailing list.
 2011-11-13 11:40:35 +00:00
Thomas Dinges
f79d14dcfa Cycles Addon: 
* Added URL to wiki
* Marked as official
* api/blender bump
 2011-11-13 10:05:07 +00:00
Thomas Dinges
880225db77 OpenCL/Nvidia: 
* Enable OpenCL Full Shading on NVIDIA cards.

Notes:
It makes not much sense to use OpenCL on a nVidia card (as it is slower compared to CUDA), but as OpenCL comes without dependencies, it's an good alternative if you don't want to install the CUDA toolkit or the build comes without CUDA kernels.
 2011-11-12 22:22:00 +00:00
Brecht Van Lommel
fc42a6185d Cycles: 
* Fix object scaling update issue with interactive rendering + static BVH.
* Fix negative scaling issue with static BVH.
* Fix #29217: excessive fireflies in first sample.
 2011-11-12 14:29:52 +00:00
Joshua Leung
4e83c67baa Hack-fix for crash-by-assertion on mingw builds on startup if the CUDA driver on 
the computer is too old (and probably can't be upgraded to a version that does)
to support the cuDriverGetVersion method.
 2011-11-12 03:59:45 +00:00
Campbell Barton
e84c0980a3 correct indentation and some whitespace edits (no functional changes) 2011-11-11 13:09:14 +00:00
Campbell Barton
eadb192986 svn merge -r41723:41751 ^/trunk/blender 2011-11-11 06:37:29 +00:00
Campbell Barton
67386c003d svn merge -r41715:41722 ^/trunk/blender 2011-11-11 05:52:46 +00:00
Brecht Van Lommel
7d110c2923 Cycles: fix missing particle panels and show emitter option not being respected. 2011-11-10 16:02:46 +00:00
Brecht Van Lommel
9dcf4bf0a6 Cycles: attempt to fix build issue with mingw. 2011-11-10 14:53:56 +00:00
Brecht Van Lommel
5b1a42cb17 Cycles: 
* Fix excessive fireflies in Velvet BSDF (patch by David).
* Disable some unused SSE code
* Remove RTTI disabling flags for now, this is giving some compile issues and
  was only needed of OSL which we're not using yet.
 2011-11-10 14:32:16 +00:00
Brecht Van Lommel
cf6a1320a8 Cycles: attempted fix for error building with sse/mtune optimization flags. 2011-11-10 14:13:32 +00:00