[Bf-blender-cvs] [1dba28221d1] tmp_hair_curves: Post merge fixes.

Lukas Toenne noreply at git.blender.org
Sun Jul 15 14:08:58 CEST 2018


Commit: 1dba28221d1984883c720ea0e30fc226a5d20ed0
Author: Lukas Toenne
Date:   Sun Jul 15 12:44:04 2018 +0100
Branches: tmp_hair_curves
https://developer.blender.org/rB1dba28221d1984883c720ea0e30fc226a5d20ed0

Post merge fixes.

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

M	source/blender/draw/engines/eevee/eevee_materials.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 4554aeb45ea..040b937f5b2 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1466,7 +1466,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;
@@ -1565,7 +1564,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/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_hair.c
index b4ceb9e5a57..11edff95da6 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, int flag)
+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, flag);
+	modifier_copyData_generic(md, target, flag);
 	
 	if (hmd->hair_system) {
 		tfmd->hair_system = BKE_hair_copy(hmd->hair_system);



More information about the Bf-blender-cvs mailing list