[Bf-blender-cvs] [d27158aae9b] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: d27158aae9bc48b2a07760a2dbe8e642fcecbe57
Author: Brecht Van Lommel
Date:   Sat Mar 10 06:55:39 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBd27158aae9bc48b2a07760a2dbe8e642fcecbe57

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_mesh.cpp
index 02ede74224a,7d6ca18b074..afcfe3d434e
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@@ -1416,7 -1385,7 +1390,7 @@@ void BlenderSync::sync_mesh_motion(BL::
  
  	/* hair motion */
  	if(numkeys)
- 		sync_curves(b_depsgraph, mesh, b_mesh, b_ob, true, time_index);
 -		sync_curves(mesh, b_mesh, b_ob, true, motion_step);
++		sync_curves(b_depsgraph, mesh, b_mesh, b_ob, true, motion_step);
  
  	/* free derived mesh */
  	b_data.meshes.remove(b_mesh, false, true, false);
diff --cc intern/cycles/blender/blender_sync.h
index 9e8d494f83b,1e7b0b32518..2ea86ba1133
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@@ -125,9 -118,11 +125,9 @@@ private
  	                 BL::Mesh& b_mesh,
  	                 BL::Object& b_ob,
  	                 bool motion,
- 	                 int time_index = 0);
+ 	                 int motion_step = 0);
 -	Object *sync_object(BL::Object& b_parent,
 -	                    int persistent_id[OBJECT_PERSISTENT_ID_SIZE],
 -	                    BL::DupliObject& b_dupli_ob,
 -	                    Transform& tfm,
 +	Object *sync_object(BL::Depsgraph& b_depsgraph,
 +	                    BL::Depsgraph::duplis_iterator& b_dupli_iter,
  	                    uint layer_flag,
  	                    float motion_time,
  	                    bool hide_tris,
diff --cc source/blender/gpu/shaders/gpu_shader_material.glsl
index 02bfc70080a,1f5ffbdcc7e..bf0e3ca4d96
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@@ -3207,62 -2866,6 +3207,62 @@@ void node_gamma(vec4 col, float gamma, 
  
  /* geometry */
  
 +void node_attribute_volume_density(sampler3D tex, out vec4 outcol, out vec3 outvec, out float outf)
 +{
 +#if defined(EEVEE_ENGINE) && defined(MESH_SHADER) && defined(VOLUMETRICS)
 +	vec3 cos = volumeObjectLocalCoord;
 +#else
 +	vec3 cos = vec3(0.0);
 +#endif
 +	outvec = texture(tex, cos).aaa;
 +	outcol = vec4(outvec, 1.0);
 +	outf = dot(vec3(1.0 / 3.0), outvec);
 +}
 +
 +void node_attribute_volume_color(sampler3D tex, out vec4 outcol, out vec3 outvec, out float outf)
 +{
 +#if defined(EEVEE_ENGINE) && defined(MESH_SHADER) && defined(VOLUMETRICS)
 +	vec3 cos = volumeObjectLocalCoord;
 +#else
 +	vec3 cos = vec3(0.0);
 +#endif
 +
 +	vec4 value = texture(tex, cos).rgba;
 +	/* Density is premultiplied for interpolation, divide it out here. */
- 	if (value.a > 0.0)
++	if (value.a > 1e-8)
 +		value.rgb /= value.a;
 +
 +	outvec = value.rgb;
 +	outcol = vec4(outvec, 1.0);
 +	outf = dot(vec3(1.0 / 3.0), outvec);
 +}
 +
 +void node_attribute_volume_flame(sampler3D tex, out vec4 outcol, out vec3 outvec, out float outf)
 +{
 +#if defined(EEVEE_ENGINE) && defined(MESH_SHADER) && defined(VOLUMETRICS)
 +	vec3 cos = volumeObjectLocalCoord;
 +#else
 +	vec3 cos = vec3(0.0);
 +#endif
 +	outf = texture(tex, cos).r;
 +	outvec = vec3(outf, outf, outf);
 +	outcol = vec4(outf, outf, outf, 1.0);
 +}
 +
 +void node_attribute_volume_temperature(sampler3D tex, vec2 temperature, out vec4 outcol, out vec3 outvec, out float outf)
 +{
 +#if defined(EEVEE_ENGINE) && defined(MESH_SHADER) && defined(VOLUMETRICS)
 +	vec3 cos = volumeObjectLocalCoord;
 +#else
 +	vec3 cos = vec3(0.0);
 +#endif
 +	float flame = texture(tex, cos).r;
 +
 +	outf = (flame > 0.01) ? temperature.x + flame * (temperature.y - temperature.x): 0.0;
 +	outvec = vec3(outf, outf, outf);
 +	outcol = vec4(outf, outf, outf, 1.0);
 +}
 +
  void node_attribute(vec3 attr, out vec4 outcol, out vec3 outvec, out float outf)
  {
  	outcol = vec4(attr, 1.0);
diff --cc tests/python/CMakeLists.txt
index 20b65889c2b,69761249002..568f66eb270
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@@ -617,5 -618,13 +618,14 @@@ if(WITH_ALEMBIC
  	)
  endif()
  
- add_subdirectory(view_layer)
+ if(WITH_CODEC_FFMPEG)
+ 	add_python_test(
+ 		ffmpeg_tests
+ 		${CMAKE_CURRENT_LIST_DIR}/ffmpeg_tests.py
+ 		--blender "$<TARGET_FILE:blender>"
+ 		--testdir "${TEST_DATA_SRC_DIR}/ffmpeg"
+ 	)
+ endif()
+ 
  add_subdirectory(collada)
++add_subdirectory(view_layer)