sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
39,519 Commits 2 Branches 0 Tags 753 MiB
091c716198
Commit Graph

481 Commits

Author SHA1 Message Date
Brecht Van Lommel
6d4841ba82 Fix #31058: missing Simplify panel for cycles. 2012-04-26 12:13:26 +00:00
Antony Riakiotakis
4782522379 Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. 
Thanks!
 2012-04-24 12:57:58 +00:00
Brecht Van Lommel
95432a2a2b Fix #31065: cycles render crash with large node groups, increased the stack 
size now, this seems to work well after some testing.
Fix: material override not working on objects without a material assigned.
 2012-04-23 18:15:38 +00:00
Brecht Van Lommel
801aaf5cdc Fix exposure being applied to cycles AO pass. 2012-04-19 15:00:54 +00:00
Brecht Van Lommel
4d1c7992d7 Fix/tweak for cycles border render, it wasn't generating the exact same samples 
when rendering a subset instead of the whole, mostly useful for debugging.
 2012-04-16 09:52:25 +00:00
Brecht Van Lommel
93df58160e Fix #30966: cycles nan mesh vertices got set to (0, 0, 0), now remove them instead. 2012-04-16 08:35:21 +00:00
Brecht Van Lommel
117f2826b9 Fix #30955: cycles render issue with lights that have shadow casting disabled. 2012-04-15 15:35:09 +00:00
Brecht Van Lommel
b219b5294b Fix #30376: cycles ignores camera override from sequencer. 2012-04-13 17:42:03 +00:00
Brecht Van Lommel
88a261c13b Cycles: add render layer use environment option to disable world lighting on 
individual render layers.
 2012-04-13 12:58:12 +00:00
Brecht Van Lommel
59377695bd Fix #30929: cycles rendering of object with scale 0 on some axis did not work 
correct with instancing.

Actually such object will not work in many places, e.g. transforming vertices
in edit mode doesn't work and textures will be misapplied in Blender Internal,
so these should be avoided.
 2012-04-13 09:08:43 +00:00
Brecht Van Lommel
7db13b989a Fix: cycles not using local 3d view camera when it is decoupled from the scene. 2012-04-12 11:42:18 +00:00
Brecht Van Lommel
a3b491eca7 Fix cycles opencl compile issue, fminf/fmaxf() was defined both as macro and function. 2012-04-11 09:07:28 +00:00
Brecht Van Lommel
1c84fb234f Fix #30896: cycles mask layer not working for objects without material assigned. 2012-04-11 08:57:54 +00:00
Thomas Dinges
ed47be3bf2 Cycles/OpenCL: 
* Reverted the general activation of __KERNEL_SHADING__.
Better to handle this in the device file. This way each platform gets specifically what it is capable of atm. 

* Nvidia has Shading + Multi Closure
* AMD (Apple) has only Clay Render
* AMD (non Apple) has Basic Shading
 2012-04-09 17:44:33 +00:00
Daniel Genrich
2e08b763c5 Bugfix [#30835]: Cycles doesn't work with AMD Juniper GPU, compiller throws errors. Thanks for reporting! 
Problem: AMD does not like something like this.
float3 *a;
flaot b = a->x;

You need to circumvent this by using:
float3 *a;
float b = (*a).x;
 2012-04-09 15:31:31 +00:00
Nicholas Bishop
1a9a8406fe Tiny fix for console warning, remove period from a description in Cycles. 2012-04-08 16:19:13 +00:00
Brecht Van Lommel
f7a0499f16 Cycles: fix nan's generated by glossy BSDF in some cases. 2012-04-06 16:08:14 +00:00
Brecht Van Lommel
91eeddc973 Fix windows compile error in previous commit. 2012-04-05 16:23:47 +00:00
Thomas Dinges
d024238fb2 Cycles / OpenCL: 
* Enable __KERNEL_SHADING__ per default for OpenCL.
This enables basic shading (color, emission, textures...) for AMD cards. 

You need the latest AMD catalyst driver in order to have this work.
 2012-04-05 16:19:51 +00:00
Brecht Van Lommel
6e93e33294 Cycles: add rejection of inf/nan samples, in principle these should not happen 
but this makes it more reliable for now.

Also add an integrator "Clamp" option, to clamp very light samples to a maximum
value. This will reduce accuracy but may help reducing noise and speed up
convergence.
 2012-04-05 15:17:45 +00:00
Brecht Van Lommel
eefdeebae5 Fix #30710: cycles wrong render time after pause/unpause in viewport. 2012-04-04 16:11:44 +00:00
Brecht Van Lommel
d7d8c668ca Fix #30803: shader node Mapping location property conflicted with based class 
location property (for the node editor), now renamed to "translation".
 2012-04-04 16:11:39 +00:00
Brecht Van Lommel
e12adeb8c9 Fix #30551: cycles passes combining did not always give identical result combined 
with antialiasing/defocus, now divide out color at the very end instead of for each
sample.
 2012-03-28 12:18:12 +00:00
Brecht Van Lommel
755f018324 Cycles: shadow pass support. Note that this only takes into account lamps, 
emitting objects or world lighting do not contribute to the shadow pass.

Consider this more as a pass useful for some compositing tricks, unlike
other lighting passes this pass can't be used to exactly reconstruct the
combined pass.
 2012-03-28 10:39:21 +00:00
Brecht Van Lommel
d87995a6b1 Cycles: add rendered draw mode option in 3d view header to show the active 
render layer rather than the viewport layers.
 2012-03-28 09:07:35 +00:00
Brecht Van Lommel
33740c5eb5 Cycles: viewport rendered draw mode now shows background images, also changed the 
image editor checkerboard pattern to be the same as cycles viewport.
 2012-03-28 09:07:10 +00:00
Brecht Van Lommel
53dab9ec69 Cycles: fix for ColorRamp node alpha output. 2012-03-26 13:21:43 +00:00
Brecht Van Lommel
bbc3d820f4 Cycles: add ColorRamp node. 2012-03-26 12:45:14 +00:00
Thomas Dinges
d3c596035b Cycles / CUDA: 
* Make Cycles aware of Computing Capability 3.0, used by the new Kepler Cards.
You'll need the CUDA 4.2 Toolkit to compile it.
 2012-03-25 17:52:50 +00:00
Campbell Barton
385c11d92c last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading. 2012-03-23 00:56:22 +00:00
Campbell Barton
303cecf139 spelling cleanup: tesselate -> tessellate (last of these found) 2012-03-20 22:56:26 +00:00
Brecht Van Lommel
b26d3f371a Fix #30603: cycles incorrect ray differentials when rendering with panorama 
camera, causing bump map issues.
 2012-03-20 19:32:12 +00:00
Brecht Van Lommel
8b4c1f729b Cycles: fix issue reported in IRC, rendering a material that mixes a transparent 
and glass BSDF would give a different result with/without using light passes.
 2012-03-20 16:16:17 +00:00
Campbell Barton
4f19c1a995 spelling cleanup 2012-03-18 07:38:51 +00:00
Campbell Barton
a04f44f486 fix [#30472] 3d view objects not rendered, cycles. 
holdout layer wasnt initializes in some cases.
 2012-03-12 01:34:38 +00:00
Thomas Dinges
e13e78495b Cycles UI files: 
* Minor cleanup and raise blender version to 2.62 in the addon.
 2012-03-11 16:25:58 +00:00
Brecht Van Lommel
36b2f4a009 Cycles: another tooltip tweak. 2012-03-09 19:01:44 +00:00
Brecht Van Lommel
077deb1453 Cycles: improve F/Stop number tooltip description. 2012-03-08 20:13:33 +00:00
Brecht Van Lommel
284fcd2df2 Cycles: fix UI when material has nodes but use nodes option is disabled, it 
didn't show this option then.
 2012-03-08 19:53:01 +00:00
Brecht Van Lommel
9b8dae71a5 Cycles: support for environment texture "Mirror Ball" projection mode, next to 
existing "Equirectangular". This projection is useful to create light probes
from a chrome ball placed in a real scene. It expects as input a photograph of
the chrome ball, cropped so the ball just fits inside the image boundaries.

Example setup with panorama camera and mixing two (poor quality) photographs
from different viewpoints to avoid stretching and hide the photographer:
http://www.pasteall.org/pic/28036
 2012-03-08 19:52:58 +00:00
Campbell Barton
ee84084f99 style cleanup: pep8 + picky edits 2012-03-08 05:36:05 +00:00
Brecht Van Lommel
cb45a5bbb0 Cycles: option to specify camera aperture in radius or f/stop: 
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Camera#Depth_of_Field

Patch by Ejner Fergo.
 2012-03-07 13:01:30 +00:00
Brecht Van Lommel
e6c2f05efa Cycles: mask layers were still confusing, now they work more like in the original 
commit again and less like blender internal, see documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
 2012-03-07 12:27:38 +00:00
Brecht Van Lommel
9fba458a7f Cycles: float texture support. Due to GPU limitations there are now 95 byte, 
and 5 float image textures. For CPU render this limit will be lifted later
on with image cache support. Patch by Mike Farnsworth.

Also changed color space option in image/environment texture node, to show
options Color and Non-Color Data, instead of sRGB and Linear, this is more
descriptive, and it was not really correct to equate Non-Color Data with
Linear.
 2012-03-07 12:27:18 +00:00
Lukas Toenne
92322b57d4 Fix for 30439, Cycles node group conversion wasn't checking node->id pointer (group node without internal node tree). This is a somewhat unusual case (UI buttons don't allow unlinking group tree), but not entirely forbidden. 
Also fixed similar issue in node_templates.c where the group tree is used to generate a button name.
 2012-03-06 11:34:57 +00:00
Brecht Van Lommel
8a76aa2e47 Cycles: fix AO pass not rendering with AO enabled for world, and make mask 
layers work more like blender internal.
 2012-02-28 19:43:33 +00:00
Brecht Van Lommel
22abc63f67 Cycles: ambient occlusion support, with AO factor and distance, and a render pass. 
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/World#Ambient_Occlusion
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes#Lighting_Passes
 2012-02-28 16:45:08 +00:00
Brecht Van Lommel
6cb896ff0a Cycles: fix msvc compile warning, patch by Jason Wilkins. 2012-02-28 16:45:01 +00:00
Brecht Van Lommel
4a90339519 Cycles: support for camera rendering an environment map with equirectangular 
environment map, by enabling the Panorama option in the camera.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Camera#Panorama

The focal length or sensor settings are not used, the UI can be tweaked still to
communicate this, also panorama should probably become a proper camera type like
perspective or ortho.
 2012-02-28 16:44:54 +00:00
Brecht Van Lommel
0052cbed0d Cycles: support for mask layers in render layer, this has the same effect as 
assigning holdout shaders to every object in the specified layers.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes#Layers
 2012-02-28 16:44:45 +00:00
Brecht Van Lommel
aecff24add Cycles: extra OpenCL NULL point check, maybe avoids some crashes. Don't think 
this should ever happen in practice but maybe it does anyway.
 2012-02-28 16:44:36 +00:00
Campbell Barton
6ca7d82932 code cleanup: white space, spelling & ';;' end of lines. 2012-02-25 16:04:03 +00:00
Brecht Van Lommel
f4bb31f26b Cycles: tweak for AMD opencl compile of advanced shading, from Daniel Genrich, 
still does not work correct but should compile if you have enough memory.
 2012-02-24 15:53:19 +00:00
Brecht Van Lommel
0cf38faea4 Fix #30140: cycles multi GPU rendering with one device supporting full 
shading and the other not can't work correct, disabled that now.
 2012-02-23 20:27:17 +00:00
Brecht Van Lommel
c4b64343d0 Fix #30246: rendering multiple render layers with CUDA still not working, 
should really be fixed now.
 2012-02-23 19:48:18 +00:00
Brecht Van Lommel
334416bdaf Cycles: fix cuda kernel not getting rebuilt correctly after changes, due to 
refactoring that changed variable names, also fixed OpenCL compile issue with
advanced shading.
 2012-02-23 15:10:10 +00:00
Thomas Dinges
f8c6f81271 Cycles: 
* Remove obsolete comments in the Oren Nayar code.
 2012-02-23 09:11:17 +00:00
Brecht Van Lommel
3eaa46e80d Cycles: improve the Oren-Nayar BSDF (roughness value for Diffuse), to avoid 
undesired dark rings, and give more accurate lighting when the light is
behind the object. As a bonus, the code is simpler & faster.

Patch by Yasuhiro Fujii, detailed explanation here:
http://mimosa-pudica.net/improved-oren-nayar.html
 2012-02-22 15:04:22 +00:00
Brecht Van Lommel
dc181ea7e4 Fix: cycles crash with multiple OpenCL platforms installed, tracked down by Sergey. 2012-02-20 14:19:34 +00:00
Campbell Barton
78f9bb6e91 svn merge ^/trunk/blender -r44118:44136 2012-02-15 18:32:08 +00:00
Brecht Van Lommel
697270a024 Fix another padding error in cycles, to complete the previous bugfix. 2012-02-15 14:56:08 +00:00
Brecht Van Lommel
2e752dea2f Fix #30139: multi render layer not working with CUDA render, due to padding error 
in render pass code.
 2012-02-15 14:32:07 +00:00
Campbell Barton
ac4484b239 svn merge ^/trunk/blender -r43976:43995 2012-02-09 01:53:14 +00:00
Brecht Van Lommel
b6d12f11fe Fix #30004: cycles brightness/contrast node issues. The formula used did not work 
very well for colors that can be outside of the 0.0..1.0 range, giving +/- infinity
results.

Now we just use a simple linear contrast factor as proposed by Paolo Sourvinos, and
clamp values to be >= 0, and also make the parameters work more in the 0..1 range
instead of the 0..100 range, to be more consistent with other nodes.
 2012-02-08 17:09:30 +00:00
Campbell Barton
19d0f93099 svn merge ^/trunk/blender -r43934:43976 2012-02-08 05:45:16 +00:00
Brecht Van Lommel
54c7f374c8 Fix #30061: cycles single render layer through python operator parameter not 
working.
 2012-02-07 20:51:33 +00:00
Brecht Van Lommel
4a427a441b Fix #30049: cycles noise texture producing nan values with some 
texture coordinates, due to int overflow.

Also minor tweak in shader code to avoid copying uninitialized
values, should have no effect though because they were not used.
 2012-02-07 17:32:01 +00:00
Brecht Van Lommel
b67b1c8564 Fix #30086: cycles background render printing same status text twice. 2012-02-07 17:22:47 +00:00
Campbell Barton
d0412a1981 svn merge ^/trunk/blender -r43864:43887 2012-02-05 02:30:30 +00:00
Brecht Van Lommel
5c395b69f5 Fix for Luxrender boost::thread conflict, workaround now is to just not use it 
in cycles and use pthreads instead.
 2012-02-04 19:58:09 +00:00
Campbell Barton
637bc0ddea Code Cleanup: pep8 edits 2012-02-04 11:10:41 +00:00
Campbell Barton
075fee4d58 svn merge ^/trunk/blender -r43830:43864 2012-02-03 01:30:21 +00:00
Campbell Barton
e3958015db Code Cleanup: check is / is not when comparing singletons. 2012-02-02 21:07:56 +00:00
Campbell Barton
8926cbd0a7 svn merge ^/trunk/blender -r43819:43830 2012-02-02 00:04:47 +00:00
Brecht Van Lommel
5504ba6f50 Cycles: material pass index button was missing from material properties still. 2012-02-01 13:38:23 +00:00
Campbell Barton
4aa82806ef svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still 2012-02-01 09:31:13 +00:00
Brecht Van Lommel
21554f2df5 Fix #30011 & #30027: cycles division by zero evaluating BSDF with zero weights, 
showed up as NaN on GPU render.
 2012-01-31 15:59:30 +00:00
Brecht Van Lommel
87149fc4b6 Fix #30034: bug in multiple importance sampling + transparency, would 
give slightly wrong lighting behind transparent objects.
 2012-01-31 14:57:46 +00:00
Brecht Van Lommel
26d3b873d5 Fix #30009: cycles translucent BSDF + environment importance sampling not 
working correct.
 2012-01-30 18:34:01 +00:00
Campbell Barton
870aa90112 svn merge ^/trunk/blender -r43733:43751 2012-01-29 21:49:49 +00:00
Brecht Van Lommel
b023665551 Cycles: another fix for CUDA render passes, needed to align float4 passes. 2012-01-27 13:58:32 +00:00
Brecht Van Lommel
4fe00cd4f9 Cycles: disable environment importance sampling code for CUDA cards with 
compute model < 2.x, to avoid running out of memory in the compiler.
 2012-01-26 19:45:59 +00:00
Campbell Barton
de4eeb9694 svn merge ^/trunk/blender -r43693:43733 2012-01-26 19:20:33 +00:00
Brecht Van Lommel
803286dde8 Cycles: render passes for CUDA cards with compute model >= 2.x. 2012-01-26 19:07:01 +00:00
Brecht Van Lommel
de5d5ded7b Cycles: fixes for OpenCL build after pass changes, patch by Daniel Genrich. 2012-01-26 15:37:33 +00:00
Brecht Van Lommel
7e86c8fcdc Fix #29966: cycles elapsed time not resetting in viewport after changes. 2012-01-26 14:55:39 +00:00
Brecht Van Lommel
f8bddbd347 Cycles: fix issues rendering second render layer passes, and avoid unnecessary 
clear of buffer.
 2012-01-26 14:55:25 +00:00
Campbell Barton
4fae6cd38d svn merge ^/trunk/blender -r43685:43693 2012-01-25 18:13:58 +00:00
Brecht Van Lommel
f99343d3b8 Cycles: Render Passes 
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
  Diffuse/Glossy/Transmission x Direct/Indirect/Color

Not supported yet:
* UV, Vector, Mist

Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.

Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
 2012-01-25 17:23:52 +00:00
Campbell Barton
75a4832af3 svn merge ^/trunk/blender -r43676:43685 2012-01-24 22:44:48 +00:00
Campbell Barton
d3090a32f2 svn merge ^/trunk/blender -r43664:43676 2012-01-24 20:19:09 +00:00
Thomas Dinges
c905415f6b Cycles Node Editor: 
* Add Use Nodes button for World shader type
* UI was not redrawing the Node area, when enabling "Use nodes", added check for it to the listener.
 2012-01-24 20:10:37 +00:00
Dalai Felinto
335ffb0ff3 Brightness/Contrast Node for Cycles 
Contrast helps to adjust IBL (HDR images used for background lighting).
Note: In the UI we are caling it Bright instead of Brightness. This copy what Blender composite is doing.
Note2: the algorithm we are using produces pure black when contrast is 100. I'm not a fan of that, but it's a division by zero. I would like to look at other algorithms (what gimp does for example). But that would be only after 2.62.
 2012-01-24 16:32:31 +00:00
Campbell Barton
5cc898ada2 svn merge ^/trunk/blender -r43616:43639 2012-01-23 16:46:35 +00:00
Thomas Dinges
9dac61c74d Cycles Textures: 
* Remove the "Use nodes" button, the TextureOutput node was never ported to trunk from the cycles branch.
 2012-01-22 22:59:21 +00:00
Thomas Dinges
b3d5224390 Cycles UI: 
* Use full width for the world sample as lamp properties
 2012-01-22 22:43:21 +00:00
Campbell Barton
4966982a5a svn merge ^/trunk/blender -r43564:43609 2012-01-22 18:04:35 +00:00
Brecht Van Lommel
27e94f7cbe Fix #29935: missing cycles update/crash when removing world datablock form scene. 2012-01-22 13:56:39 +00:00
Brecht Van Lommel
3fa4b6ea7d Fix missing shadows with cycles world sample as lamp option, my mistake in 
tweaking patch.
 2012-01-22 13:26:59 +00:00
Campbell Barton
acfeb47aa3 use property definitions more consistant with other addons in trunk. (no functional change) 2012-01-20 18:31:23 +00:00
Brecht Van Lommel
5873301257 Sample as Lamp option for world shaders, to enable multiple importance sampling. 
By default lighting from the world is computed solely with indirect light
sampling. However for more complex environment maps this can be too noisy, as
sampling the BSDF may not easily find the highlights in the environment map
image. By enabling this option, the world background will be sampled as a lamp,
with lighter parts automatically given more samples.

Map Resolution specifies the size of the importance map (res x res). Before
rendering starts, an importance map is generated by "baking" a grayscale image
from the world shader. This will then be used to determine which parts of the
background are light and so should receive more samples than darker parts.
Higher resolutions will result in more accurate sampling but take more setup
time and memory.

Patch by Mike Farnsworth, thanks!
 2012-01-20 17:49:17 +00:00
Campbell Barton
7b2101ace9 svn merge ^/trunk/blender -r43482:43524 2012-01-19 11:31:31 +00:00
Brecht Van Lommel
3ce32c3fec Fix small code issue pointed out by nico_ga, was doing negation on unsigned type, 
didn't seem to break anything though.
 2012-01-18 22:36:12 +00:00
Campbell Barton
0f28c1c27a svn merge ^/trunk/blender -r43461:43472 2012-01-17 21:08:25 +00:00
Campbell Barton
2019f636b0 misc small changes and bmesh support for testing script 2012-01-17 18:01:16 +00:00
Campbell Barton
bbe69705a5 svn merge ^/trunk/blender -r43420:43436 2012-01-17 02:20:23 +00:00
Brecht Van Lommel
92764260d7 Cycles: add option to cache BVH's between subsequent renders, storing the BVH on 
disk to be reused by the next render.

This is useful for rendering animations where only the camera or materials change.
Note that saving the BVH to disk only to be removed for the next frame is slower
if this is not the case and the meshes do actually change.

For a render, it will save bvh files to the cache user directory, and remove all
cache files from other renders. The files are named using a MD5 hash based on the
mesh, to verify if the meshes are still the same.
 2012-01-16 13:13:37 +00:00
Campbell Barton
917714acf7 svn merge ^/trunk/blender -r43345:43381 2012-01-15 09:16:39 +00:00
Campbell Barton
9c2a58a811 remove api from addon bl_info, was never used. 2012-01-14 13:02:20 +00:00
Campbell Barton
705f23064e svn merge ^/trunk/blender -r43294:43338 2012-01-13 01:39:57 +00:00
Brecht Van Lommel
b20a56b2ca Fix #29860: cycles musgrave scale input not working correct. 2012-01-12 17:13:56 +00:00
Campbell Barton
a7b0a11811 svn merge ^/trunk/blender -r43278:43294 2012-01-11 15:04:54 +00:00
Campbell Barton
b308e61312 svn merge ^/trunk/blender -r43220:43278 --accept postpone 2012-01-11 14:14:04 +00:00
Brecht Van Lommel
6ce92d09f7 Fix #29848: cycles not respecting dupli group visible layers, also exposed 
DupliObject.hide property in API now.
 2012-01-11 13:55:00 +00:00
Brecht Van Lommel
778774ba16 Fix: cycles CPU device not being used when it should be on some multi-GPU 
configurations.
 2012-01-11 13:18:06 +00:00
Brecht Van Lommel
d7932ceea8 Cycles: multi GPU rendering support. 
The rendering device is now set in User Preferences > System, where you can
choose between OpenCL/CUDA and devices. Per scene you can then still choose
to use CPU or GPU rendering.

Load balancing still needs to be improved, now it just splits the entire
render in two, that will be done in a separate commit.
 2012-01-09 16:58:01 +00:00
Brecht Van Lommel
47d9c6689b Cycles: show elapsed time for F12/background render. 2012-01-09 16:57:46 +00:00
Brecht Van Lommel
8f37c143ed Cycles: small tweak to checker texture, scale rather than add with epsilon, 
looks a bit better on all sides of a mesh.
 2012-01-09 16:57:26 +00:00
Brecht Van Lommel
8bfa48384d Cycles: checker texture node, patch by Thomas. 2012-01-08 14:55:43 +00:00
Campbell Barton
98bdf0274b svn merge ^/trunk/blender -r43183:43220 2012-01-08 13:09:09 +00:00
Brecht Van Lommel
49bc284d10 Fix #29760: cycles border render issue on 32 bit linux. 2012-01-05 22:41:46 +00:00
Campbell Barton
348f116fe5 svn merge ^/trunk/blender -r43124:43160 2012-01-05 11:23:24 +00:00
Brecht Van Lommel
049ab98469 Cycles: device code refactoring, no functional changes. 2012-01-04 18:06:32 +00:00
Campbell Barton
c0eec8f379 svn merge ^/trunk/blender -r43062:43085 2012-01-03 02:16:52 +00:00
Brecht Van Lommel
84437bb5e9 Fix #29695: cycles particle emitter not being properly hidden. 2012-01-02 19:44:13 +00:00
Brecht Van Lommel
1e96b5f284 Fix #29740: missing cycles viewport update with animated node socket values. 2012-01-02 19:44:07 +00:00
Brecht Van Lommel
2077b7e3b7 Fix #29755: cycles crash with array modifier that can produce material indices 
that are out of bounds.
 2012-01-02 15:51:49 +00:00
Campbell Barton
b64f352270 svn merge ^/trunk/blender -r43033:43062 2012-01-02 02:57:36 +00:00
Brecht Van Lommel
b5595298d3 Cycles code refactoring: change displace kernel into more generic shader 
evaluate kernel, added background shader evaluate.
 2011-12-31 15:18:13 +00:00
Campbell Barton
50ca81154e svn merge ^/trunk/blender -r42973:42991 2011-12-30 09:23:06 +00:00
Brecht Van Lommel
e32a117c8b Fix: cycles camera dof object with non-uniform scale gave incorrect distance. 2011-12-29 23:34:25 +00:00
Campbell Barton
6b587bc5a1 svn merge ^/trunk/blender -r42957:42967 2011-12-29 06:44:51 +00:00
Dalai Felinto
b4c95833ab bugfix: [#29711] Cycles - HSV Node - Hue Change Bug 
* Adding hue instead of removing it.

fmod doesn't work as % when it comes to negative numbers:
fmod( 1.3, 1) ==  1.3 % 1 == 0.3
fmod(-0.3, 1) != -0.3 % 1
 2011-12-29 05:40:48 +00:00
Campbell Barton
ea36d4eb22 svn merge ^/trunk/blender -r42953:42957 2011-12-29 01:58:47 +00:00
Campbell Barton
85a97f64a7 add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. 
also some cmake formatting edits.
 2011-12-29 01:46:58 +00:00
Campbell Barton
cb8090d4c8 svn merge ^/trunk/blender -r42940:42953 2011-12-28 22:55:45 +00:00
Brecht Van Lommel
9d3f5ea334 Fix #29715: cycles and glsl normal node not working correct. 2011-12-28 19:42:22 +00:00
Brecht Van Lommel
c9830549ea Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes, 
after group socket refactoring.
 2011-12-28 19:42:08 +00:00
Campbell Barton
2cd5436a81 svn merge ^/trunk/blender -r42839:42871 2011-12-25 21:31:19 +00:00
Thomas Dinges
a06358570e Cycles Test App: 
* Added some new integrator parameters to the xml reading. 
* Added ability to specify window width/height, if not set it uses film/camera width/height. 
* Added back the xml exporter script from cycles branch, with modifications to hock up into the UI. To use it, copy the script into 2.61/scripts/startup.

Note: This is intended for developers for now, but the standalone Cycles app has potential to be used as benchmark for example.
 2011-12-25 13:34:18 +00:00
Campbell Barton
33bd38ebc7 minor edits to cycles c/python module 
- rename 'bcycles' --> '_cycles', since this is the python convention when a py module uses a C module internally.
- use macros for returning None
- make with_osl an attribute rather then a function.
- changes methods METH_VARARGS --> METH_O when single args are used.
 2011-12-24 02:47:13 +00:00
Campbell Barton
4ced91da47 svn merge ^/trunk/blender -r42778:42839 2011-12-23 08:41:53 +00:00
Thomas Dinges
e68f0ff3c0 Another Fix after Cucumber Merge: 
* Cycles did not displayed the Scene panels anymore, due to addition of COMPAT_ENGINE to them.
 2011-12-22 22:34:23 +00:00
Brecht Van Lommel
c287a09b40 Cycles: support for multiple render layers. It currently renders each layer 
entirely before moving on to the next.
 2011-12-21 20:51:55 +00:00
Brecht Van Lommel
b65061e2ae Cycles: code refactoring, to do render layer visibility test a bit different, 
replacing the camera visibility flag with object layer flags.
 2011-12-21 20:51:43 +00:00
Brecht Van Lommel
34909c64e5 Cycles: some small code refactoring related to buffer parameters. 2011-12-21 13:48:35 +00:00
Campbell Barton
1fef05084e svn merge ^/trunk/blender -r42761:42776 2011-12-20 22:08:24 +00:00
Thomas Dinges
2d1de2e78d Cycles/CUDA: 
* Rename shader model to compute capability in error messages.
 2011-12-20 18:59:10 +00:00
Brecht Van Lommel
690de79580 Cycles: some tweaks for apple opencl with ATI cards, to get it working up to 
the level of ambient occlusion render, shaders still fail. Fixes found with
much help from Jens and Dalai.
 2011-12-20 17:36:56 +00:00
Brecht Van Lommel
40259cfe7b Cycles: avoid using float3 in kernel constant memory, just so we're sure alignment 
is working compatible between cpu and gpu.
 2011-12-20 12:25:45 +00:00