[Bf-blender-cvs] [08399aca62] blender2.8: Clay Engine : fix

Clément Foucault noreply at git.blender.org
Thu Feb 9 12:06:04 CET 2017


Commit: 08399aca62975741f407703ff40bf2060ee3b758
Author: Clément Foucault
Date:   Thu Feb 9 12:04:37 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB08399aca62975741f407703ff40bf2060ee3b758

Clay Engine : fix

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

M	source/blender/draw/engines/clay/clay.c

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

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index 5feac48960..7cfefa25b4 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -539,14 +539,14 @@ static void override_setting(CollectionEngineSettings *ces, const char *name, vo
 	CollectionEngineProperty *cep = BKE_collection_engine_property_get(ces, name);
 
 	if (!cep) return;
-	if ((cep->flag & COLLECTION_PROP_USE) == 0) return;
+	//if ((cep->flag & COLLECTION_PROP_USE) == 0) return;
 
 	if (cep->type == COLLECTION_PROP_TYPE_INT) {
 		CollectionEnginePropertyInt *prop = (CollectionEnginePropertyInt *)cep;
 		*((int *)ret) = prop->value;
 	}
 	else {
-		CollectionEnginePropertyInt *prop = (CollectionEnginePropertyInt *)cep;
+		CollectionEnginePropertyFloat *prop = (CollectionEnginePropertyFloat *)cep;
 		*((float *)ret) = prop->value;
 	}
 }




More information about the Bf-blender-cvs mailing list