[Bf-blender-cvs] [dd7a727910d] blender2.8: Fix accidentally removed particle function in GLSL, still not supported though.
Brecht Van Lommel
noreply at git.blender.org
Tue Jul 10 16:33:14 CEST 2018
Commit: dd7a727910dd02d830d11d726acf52fd88ea6e8e
Author: Brecht Van Lommel
Date: Tue Jul 10 15:35:59 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdd7a727910dd02d830d11d726acf52fd88ea6e8e
Fix accidentally removed particle function in GLSL, still not supported though.
===================================================================
M source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 3affacf5203..2496170db3f 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -170,6 +170,23 @@ void color_to_blender_normal_new_shading(vec3 color, out vec3 normal)
/*********** SHADER NODES ***************/
+void particle_info(
+ vec4 sprops, vec4 loc, vec3 vel, vec3 avel,
+ out float index, out float random, out float age,
+ out float life_time, out vec3 location,
+ out float size, out vec3 velocity, out vec3 angular_velocity)
+{
+ index = sprops.x;
+ random = loc.w;
+ age = sprops.y;
+ life_time = sprops.z;
+ size = sprops.w;
+
+ location = loc.xyz;
+ velocity = vel;
+ angular_velocity = avel;
+}
+
void vect_normalize(vec3 vin, out vec3 vout)
{
vout = normalize(vin);
More information about the Bf-blender-cvs
mailing list