Commit: a927dbd17a83d64e97461851f390f55cb38b43d4
Author: Lukas Tönne
Date: Tue Jun 19 07:06:33 2018 +0100
Branches: hair_guides hair_guides_grooming
https://developer.blender.org/rBa927dbd17a83d64e97461851f390f55cb38b43d4
Merge branch 'blender2.8' into hair_guides
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/particle.c
index c46d342f8a1,41445492c04..44972339c91
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@@ -1519,9 -1514,9 +1519,9 @@@ float psys_particle_value_from_verts(Me
float mapfw[4];
int mapindex;
- if (!psys_map_index_on_dm(mesh, from, pa->num, pa->num_dmcache,
pa->fuv, pa->foffset, &mapindex, mapfw))
+ if (!psys_map_index_on_mesh(mesh, from, pa->num, pa->num_dmcache,
pa->fuv, pa->foffset, &mapindex, mapfw))
return 0.0f;
-
+
return psys_interpolate_value_from_verts(mesh, from, mapindex, mapfw,
values);
}
diff --cc source/blender/draw/engines/workbench/workbench_deferred.c
index f32060bd64f,3bf7c34d5eb..b814d85a6e0
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@@ -84,8 -86,9 +86,10 @@@ static struct
} e_data = {{NULL}};
/* Shaders */
+ extern char datatoc_common_fxaa_lib_glsl[];
+ extern char datatoc_common_fullscreen_vert_glsl[];
extern char datatoc_common_hair_lib_glsl[];
+extern char datatoc_common_hair_guides_lib_glsl[];
extern char datatoc_workbench_prepass_vert_glsl[];
extern char datatoc_workbench_prepass_frag_glsl[];
diff --cc source/blender/draw/engines/workbench/workbench_private.h
index c7173ee8f27,9e43a5c4a48..a255d0a3b61
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@@ -144,12 -142,11 +144,13 @@@ typedef struct WORKBENCH_PrivateData
struct GPUShader *composite_sh;
struct GPUShader *transparent_accum_sh;
struct GPUShader *transparent_accum_hair_sh;
+ struct GPUShader *transparent_accum_hair_fibers_sh;
struct GPUShader *transparent_accum_texture_sh;
struct GPUShader *transparent_accum_texture_hair_sh;
+ struct GPUShader *transparent_accum_texture_hair_fibers_sh;
View3DShading shading;
StudioLight *studio_light;
+ UserDef *user_preferences;
int drawtype;
struct GPUUniformBuffer *world_ubo;
struct DRWShadingGroup *shadow_shgrp;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
