[Bf-blender-cvs] [1e69c9e1c8] render-layers: Another fixup for rB6cdb3845 (Added collection props getter/setter)
Dalai Felinto
noreply at git.blender.org
Fri Feb 3 17:40:24 CET 2017
Commit: 1e69c9e1c85dd3e18253efc3e5d3dd22c0d10388
Author: Dalai Felinto
Date: Fri Feb 3 17:39:54 2017 +0100
Branches: render-layers
https://developer.blender.org/rB1e69c9e1c85dd3e18253efc3e5d3dd22c0d10388
Another fixup for rB6cdb3845 (Added collection props getter/setter)
Values were getting clamped
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index c16d00de3e..30c9e21727 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -110,7 +110,7 @@ void BKE_collection_engine_property_add_float(struct CollectionEngineSettings *c
void BKE_collection_engine_property_add_int(struct CollectionEngineSettings *ces, const char *name, int value);
struct CollectionEngineProperty *BKE_collection_engine_property_get(struct CollectionEngineSettings *ces, const char *name);
int BKE_collection_engine_property_value_get_int(struct CollectionEngineSettings *ces, const char *name);
-int BKE_collection_engine_property_value_get_float(struct CollectionEngineSettings *ces, const char *name);
+float BKE_collection_engine_property_value_get_float(struct CollectionEngineSettings *ces, const char *name);
void BKE_collection_engine_property_value_set_int(struct CollectionEngineSettings *ces, const char *name, int value);
void BKE_collection_engine_property_value_set_float(struct CollectionEngineSettings *ces, const char *name, float value);
bool BKE_collection_engine_property_use_get(struct CollectionEngineSettings *ces, const char *name);
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 3d3e621e97..8d0314bd89 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -775,7 +775,7 @@ int BKE_collection_engine_property_value_get_int(CollectionEngineSettings *ces,
return prop->value;
}
-int BKE_collection_engine_property_value_get_float(CollectionEngineSettings *ces, const char *name)
+float BKE_collection_engine_property_value_get_float(CollectionEngineSettings *ces, const char *name)
{
CollectionEnginePropertyFloat *prop;
prop = (CollectionEnginePropertyFloat *)BLI_findstring(&ces->properties, name, offsetof(CollectionEngineProperty, name));
More information about the Bf-blender-cvs
mailing list