Merge branch 'master' into cycles_point_density

Cycles point density: Remove constant color output

It's not really clear which exact color the constant is from the artist
perspective and if constant color is really needed just use RGB input,
it'll give better performance.

Cycles point density: Show color source input only for particle source

It's not supported by object vertices source so doesn't make sense to show it.

Merge branch 'master' into cycles_point_density

Conflicts:
intern/cycles/kernel/svm/svm.h
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Cycles point density: Support for OSL backend

Merge branch 'master' into cycles_point_density

Fix for particle texture evaluation.

RGB value from intensity was overriding explicit texture values in every
case, only do this for scalar modes.

Cycles point density: Avoid race condition when using same object as texture source

If the same object is used by two point density textures in Particle source mode
it was really easy to catch a crash in derived render creation.

For now solved with mutex lock around cache_pointdensity_ex() which is not ideal
but seems to be better compromise comparing to other alternatives.

Merge branch 'master' into cycles_point_density

Merge branch 'master' into cycles_point_density

Fix for undefined psmd field in when evaluating particle textures.

Support for particle texture color in point density textures.

This works for all pointdensity use cases, BI as well as Cycles.

Particle color influence option for particle textures.

This color is currently only displayed in the viewport (when enabling
"Texture" color mode in the Display settings). It will be used for
controlling the smoke color when using particles for smoke emission.

Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/intern/rna_particle.c

Color support for point density texture in Cycles.

This extends the point density evaluation to also store RGB color values
in the array provided by Cycles.

Since internally all Cycles textures are 4-float RGBA textures anyway,
it does not make a lot of sense to store density and color separately.
This could eventually be preferable to avoid unnecessary storage.

Cycles point density: Fix using double semicolon at the end of line

Cycles point density: Particle state coordinates are actually in the world space

Code was assuming they're in the object space which caused wrong
texture sampling and translation to the world location.

Cycles point density: Fix crash when source object is not set

Merge branch 'master' into cycles_point_density

Fix compilation error of blender player

Cycles: Point density texture experiment

This commit implements point density texture for Cycles shading nodes.

It's done via creating voxel texture at shader compilation time, Not
totally memory efficient, but avoids adding sampling code to kernel
(which keeps render time as low as possible), In the future this will
be compensated by using OpenVDB for more efficient storage of sparse
volume data.

Sampling of the voxel texture is happening at blender side and the
same code is used as for Blender Internal's renderer.

This texture is controlled by only object, particle system and radius.
Linear falloff is used and there's no turbulence. This is because
falloff is expected to happen using Curve Mapping node. Turbulence
will be done as a distortion on the input coordinate. It's already
possible to fake it using nose textures and in the future we can add
more proper turbulence distortion node, which then could also be used
for 2D texture mapping.

OSL is not currently supported. There's no actual stoppers for support
it, but so far it's not really a priority at this point.

Reviewers: campbellbarton, juicyfruit, brecht

Subscribers: campbellbarton, dingto, eyecandy

Differential Revision: https://developer.blender.org/D1208