Commit Graph

467 Commits

Author SHA1 Message Date
Lukas Toenne
0586705b63 Fix #31747, broken image sequence loading after r47432.
The image file name function was updating the iuser->framenr using a supposed cfra parameter. However, the actual cfra is unknown when loading movies or sequences, so the iuser->framenr value itself was passed in its place, leading to incremental addition of the iuser frame offset. Removed the cfra parameter altogether from the image path function. This should instead be done separately if necessary, it's not an inherent part of constructing the image file name.
2012-06-10 07:35:45 +00:00
Campbell Barton
2c1abe1f58 style cleanup: assignment & indentation. 2012-06-09 18:56:12 +00:00
Campbell Barton
c6cffe98fa code cleanup: removed/renamed shadow & duplicate variable definitions. 2012-06-09 18:20:40 +00:00
Campbell Barton
43361487ba code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting). 2012-06-09 17:45:22 +00:00
Campbell Barton
0fbb6bff27 style cleanup: block comments 2012-06-09 17:22:52 +00:00
Thomas Dinges
49a64a0ab7 Cycles / Cleanup:
* All references to old textures should now be finally removed.
2012-06-08 20:17:02 +00:00
Thomas Dinges
7c87f646c2 Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore. 
* Some renaming for consistency and to match new texture names.
2012-06-08 19:57:25 +00:00
Thomas Dinges
3d740121ed Cycles / Code Cleanup:
* Removed a workaround for the NodeType enum, uses consecutive values now. 

I could not find issues with CUDA, when compiling with Toolkit 4.2 (all sm kernels) and regression files rendered fine on my GPU with sm_21.
2012-06-08 19:21:12 +00:00
Lukas Toenne
6563a05cad Added a default case in switch to avoid paranoid compiler warnings. 2012-06-08 17:02:02 +00:00
Lukas Toenne
5e1bbde01d Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed.
The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/
2012-06-08 16:17:57 +00:00
Brecht Van Lommel
78cf502c80 Cycles: border render now works in the viewport, when looking through the
camera, same as in render. It draws objects in solid draw mode outside of
the border.
2012-06-06 23:27:43 +00:00
Brecht Van Lommel
5ebc88266e Cycles: small code fix for disabled code. 2012-06-06 23:27:38 +00:00
Thomas Dinges
46945d805f Revert my own commit r47544, this does not seem to be the correct fix. :/ 2012-06-06 23:01:42 +00:00
Campbell Barton
d5032657ed style cleanup 2012-06-06 22:38:39 +00:00
Thomas Dinges
379c4ae4d8 Cycles / OSL:
* Missing header kernel_passes.h, needed for "direction_to_panorama" in kernel_triangle.h
2012-06-06 22:36:07 +00:00
Thomas Dinges
47c96b6e40 Cycles / OSL:
* Fixes for some silly typos in the checker shader.
* Added missing GPL licence block to node_fresnel.h.
2012-06-06 16:00:21 +00:00
Thomas Dinges
da38a0348a Cycles / OSL:
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture.
2012-06-05 15:40:02 +00:00
Thomas Dinges
2221b994bc Cycles / OSL:
* Remove oslexec_pvt.h header and some typo fixes. 
* This file needs deeper updates for changes done in OSL 0.6.0, see
11ce51418b
2012-06-05 09:29:47 +00:00
Campbell Barton
2d290040a1 style cleanup 2012-06-04 22:44:58 +00:00
Thomas Dinges
0d3b19e734 Cycles / OSL:
* Fixes for changes in the OSL register_closure() API.
2012-06-04 20:50:59 +00:00
Thomas Dinges
510f98576a Cycles / OSL:
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)
2012-06-04 19:53:50 +00:00
Brecht Van Lommel
4e338e894f Cycles: support for image sequences in image/environment texture node. 2012-06-04 19:38:33 +00:00
Brecht Van Lommel
d9589bf0dd Cycles: fix spot lamp emitting light in two directions. 2012-06-04 19:38:10 +00:00
Thomas Dinges
ca7197b620 Cycles / OSL:
* __OSL__ is now defined for CPU when building with OSL.

* First batch of compile fixes, remove some unneeded std namespace declarations and added missing includes.
2012-06-04 19:00:13 +00:00
Brecht Van Lommel
6548f7efef Cycles: spot lamp support. 2012-06-04 17:17:10 +00:00
Thomas Dinges
f9856c1c2d Cycles / OSL:
* Update the Oren Nayar shader to incorporate updates / fixes from r41968 and r44330.
2012-06-03 18:04:52 +00:00
Brecht Van Lommel
66f4ab396f Cycles: different fix for object info random range issue. 2012-06-03 09:50:17 +00:00
Thomas Dinges
345a8d8170 Cycles / OSL Textures:
* Ported my checker texture to OSL. :)
2012-06-03 00:02:24 +00:00
Thomas Dinges
a4f3475846 Cycles / OSL Textures:
* More fixes, replaced all remaining size variables with scale ones.
* Remove nonzero check in OSL textures, not needed anymore, was there to prevent division by zero for the size variable.
2012-06-02 22:57:26 +00:00
Thomas Dinges
014105f35d Cycles / OSL:
* More fixes for r41599, removed clouds and distorted noise textures and ported the Noise texture to OSL. 
ToDo: Color output is still commented, needs a closer look. 

* Some more fixes (comments, uninitialized variables)
2012-06-02 21:34:25 +00:00
Thomas Dinges
298d311bd6 Cycles / Object Info Node:
* The random output had a range from -0.5 to 0.5, added an offset of 0.5 to bring it into the 0.0 / 1.0 range, which is in alignment with Shader Node Guidelines. 
Patch by Agustin Benavidez, thanks!
2012-06-02 21:04:16 +00:00
Thomas Dinges
d6128ae3c6 Cycles / OSL:
* Forgot to rename Gradient OSL file.
2012-06-02 19:25:12 +00:00
Thomas Dinges
a5b2d2a2be Cycles / OSL:
* More OSL fixes for r41599, removed marble and wood texture and ported Wave Texture to OSL.
2012-06-02 19:14:14 +00:00
Thomas Dinges
cf929c7796 Cycles / Wave Texture:
* Found an issue in the shader code, it used the x coordinate twice.
2012-06-02 17:44:28 +00:00
Thomas Dinges
d61e6e15e4 Cycles / OSL Fixes:
* OSL textures were never updated after the refactor in november 2011.
 
* Remove stucci texture and renamed blend to gradient.
2012-06-02 17:10:59 +00:00
Campbell Barton
07ce209c64 code cleanup: warnings 2012-06-01 14:59:06 +00:00
Thomas Dinges
2b5eed9689 Cycles:
* Added missing GPL licence block to kernel_textures.h
2012-05-31 20:26:36 +00:00
Lukas Toenne
0e9b0f6d9e Fix #31645, mix node results in crash upon render. This happens when unused mix nodes are removed from the cycles graph. In case the inputs are both unconnected it still tried to reconnect them. 2012-05-30 15:47:12 +00:00
Brecht Van Lommel
9e2f377273 Fix #31556: cycles object info random value was not properly randomized for
dupligroups.
2012-05-29 10:34:16 +00:00
Sergey Sharybin
df8880a81f Fix compilation error of Cycles after recent py node removal 2012-05-29 09:51:16 +00:00
Thomas Dinges
a7c68afc72 Cycles / CUDA:
* Remove double declaration of cosf.
2012-05-28 23:51:06 +00:00
Thomas Dinges
d3c6c6babd Cycles / CUDA:
* Remove -use_fast_math flag from scons as well.
2012-05-28 19:49:26 +00:00
Brecht Van Lommel
131de4352b Cycles: fixes to make CUDA 4.2 work, compiling gave errors in shadows and
other places, was mainly due to instancing not working, but also found
issues in procedural textures.

The problem was with --use_fast_math, this seems to now have way lower
precision for some operations. Disabled this flag and selectively use
fast math functions. Did not find performance regression on GTX 460 after
doing this.
2012-05-28 19:21:13 +00:00
Thomas Dinges
04c30c5efb Scons / MSVC - Windows x64
* SSE/SSE2 is an unknown option for the compiler (Command line warning D9002 : ignoring unknown option '/arch:SSE2'), so it can be left out because on x64 it automatically builds with SSE and SSE2.
2012-05-28 09:20:04 +00:00
Campbell Barton
857dedbc58 style cleanup 2012-05-27 00:36:50 +00:00
Brecht Van Lommel
7f7ba3243d Fix cycles render issue with a (useless) mix node that has the same shader
plugged into both sockets.
2012-05-23 17:55:34 +00:00
Brecht Van Lommel
f8481fed47 Fix: cycles not supporting scene background sets. 2012-05-23 09:46:33 +00:00
Brecht Van Lommel
c3e1fce775 Cycles: add Object Info node, with outputs object location, object/material
pass index, and a random number unique to the instance of the object.

This can be useful to give some variation to a single material assigned to
multiple instances, either manually controlled through the object index, based
on the object location, or randomized for each instance. 

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info
2012-05-21 12:52:28 +00:00
Brecht Van Lommel
93aa83f0a3 Fix #31518: changing cycles exposure did unnecessary rerender in viewport. 2012-05-18 14:06:53 +00:00
Brecht Van Lommel
3e83fd441d Fix #31486: cycles texture coordinate reflection output has wrong direction. 2012-05-18 12:49:22 +00:00