Commit: 4a920429161083c54805762298786a27a0d99e1c
Author: Lukas Toenne
Date: Sun Jul 15 12:44:04 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB4a920429161083c54805762298786a27a0d99e1c
Post merge fixes.
===================================================================
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/intern/draw_cache_impl_hair.c
M source/blender/modifiers/intern/MOD_hair.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c
b/source/blender/draw/engines/eevee/eevee_materials.c
index 011457c8243..aadebb5f3cb 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1494,7 +1494,6 @@ static void material_particle_hair(
}
case GPU_MAT_QUEUED:
{
- sldata->probes->all_materials_updated = false;
color_p = compile_col;
metal_p = spec_p = rough_p = ½
break;
@@ -1582,7 +1581,6 @@ static void material_hair(
}
case GPU_MAT_QUEUED:
{
- sldata->probes->all_materials_updated =
false;
color_p = compile_col;
metal_p = spec_p = rough_p = ½
break;
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c
b/source/blender/draw/engines/workbench/workbench_forward.c
index cad43ce01d3..af5ba3dc357 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -272,7 +272,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
memset(e_data.transparent_accum_sh_cache, 0x00, sizeof(struct
GPUShader *) * MAX_SHADERS);
char *defines = workbench_material_build_defines(wpd, false,
DRW_SHADER_HAIR_NONE);
- char *defines_texture = workbench_material_build_defines(wpd,
true, DRAW_SHADER_HAIR_NONE);
+ char *defines_texture = workbench_material_build_defines(wpd,
true, DRW_SHADER_HAIR_NONE);
char *defines_hair = workbench_material_build_defines(wpd,
false, DRW_SHADER_HAIR_PARTICLES);
char *defines_hair_fibers =
workbench_material_build_defines(wpd, false, DRW_SHADER_HAIR_FIBERS);
char *forward_vert = workbench_build_forward_vert();
@@ -287,7 +287,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
datatoc_workbench_forward_depth_frag_glsl,
defines_hair);
e_data.object_outline_hair_fibers_sh = DRW_shader_create(
forward_vert, NULL,
- forward_depth_frag, defines_hair_fibers);
+ forward_vert, defines_hair_fibers);
e_data.checker_depth_sh = DRW_shader_create_fullscreen(
diff --git a/source/blender/draw/intern/draw_cache_impl_hair.c
b/source/blender/draw/intern/draw_cache_impl_hair.c
index 9069ae7d3a8..ebbbdb45b9e 100644
--- a/source/blender/draw/intern/draw_cache_impl_hair.c
+++ b/source/blender/draw/intern/draw_cache_impl_hair.c
@@ -206,7 +206,7 @@ static void hair_batch_cache_ensure_fibers(const
HairExportCache *hair_export, H
static unsigned curve_param_id, fiber_index_id;
/* initialize vertex format */
- if (format.attrib_ct == 0) {
+ if (format.attr_len == 0) {
fiber_index_id = GWN_vertformat_attr_add(&format,
"fiber_index", GWN_COMP_I32, 1, GWN_FETCH_INT);
curve_param_id = GWN_vertformat_attr_add(&format,
"curve_param", GWN_COMP_F32, 1, GWN_FETCH_FLOAT);
}
@@ -339,7 +339,7 @@ static void hair_batch_cache_ensure_follicles(
static unsigned pos_id;
/* initialize vertex format */
- if (format.attrib_ct == 0) {
+ if (format.attr_len == 0) {
pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32,
3, GWN_FETCH_FLOAT);
}
@@ -384,7 +384,7 @@ static void hair_batch_cache_ensure_guide_curves(
static unsigned pos_id;
/* initialize vertex format */
- if (format.attrib_ct == 0) {
+ if (format.attr_len == 0) {
pos_id = GWN_vertformat_attr_add(&format, "pos", GWN_COMP_F32,
3, GWN_FETCH_FLOAT);
}
diff --git a/source/blender/modifiers/intern/MOD_hair.c
b/source/blender/modifiers/intern/MOD_hair.c
index dc4e2bf6c90..538687b6525 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_hair.c
@@ -63,12 +63,12 @@ static void initData(ModifierData *md)
hmd->draw_settings = BKE_hair_draw_settings_new();
}
-static void copyData(const ModifierData *md, ModifierData *target)
+static void copyData(const ModifierData *md, ModifierData *target, const int
flag)
{
const HairModifierData *hmd = (HairModifierData *) md;
HairModifierData *tfmd = (HairModifierData *) target;
- modifier_copyData_generic(md, target);
+ modifier_copyData_generic(md, target, flag);
if (hmd->hair_system) {
tfmd->hair_system = BKE_hair_copy(hmd->hair_system);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
