diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-09 14:04:37 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-09 14:04:37 +0300 |
| commit | 08399aca62975741f407703ff40bf2060ee3b758 (patch) | |
| tree | 7b59f2b875b26d2c224b787d9d0d08633e94b0f8 /source/blender | |
| parent | 0692fc9665d089cbb7779a444864fa431986abf2 (diff) | |
Clay Engine : fix
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/draw/engines/clay/clay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c index 5feac489607..7cfefa25b46 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; } } |