Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-02-03 19:39:54 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-06 12:49:55 +0300
commit6f6f3a524a7f840df403d28734bcf1281a90ff42 (patch)
tree4c08e6d210d1106211ecc9321ab3a3f57cca83ee
parent71c8db2a0c7e47150f2386b46f661141d73ff4cd (diff)
Another fixup for rB6cdb3845 (Added collection props getter/setter)clay-engine
Values were getting clamped
-rw-r--r--source/blender/blenkernel/BKE_layer.h2
-rw-r--r--source/blender/blenkernel/intern/layer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index c16d00de3e3..30c9e217272 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 6ebc3719603..0ccf2d6ac91 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));