[Bf-blender-cvs] [84aa9d6] hair_immediate_fixes: New simple storage method for single sample values.

Lukas Tönne noreply at git.blender.org
Sat Dec 27 11:32:39 CET 2014


Commit: 84aa9d62c405cb4c43b7bb9892fc1cd245f4e6c4
Author: Lukas Tönne
Date:   Mon Dec 1 14:38:03 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB84aa9d62c405cb4c43b7bb9892fc1cd245f4e6c4

New simple storage method for single sample values.

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

M	source/blender/blenkernel/BKE_mesh_sample.h
M	source/blender/blenkernel/intern/mesh_sample.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_sample.h b/source/blender/blenkernel/BKE_mesh_sample.h
index fe52404..181900b 100644
--- a/source/blender/blenkernel/BKE_mesh_sample.h
+++ b/source/blender/blenkernel/BKE_mesh_sample.h
@@ -47,6 +47,7 @@ typedef struct MSurfaceSampleStorage {
 	int free_data;
 } MSurfaceSampleStorage;
 
+void BKE_mesh_sample_storage_single(struct MSurfaceSampleStorage *storage, struct MSurfaceSample *sample);
 void BKE_mesh_sample_storage_array(struct MSurfaceSampleStorage *storage, struct MSurfaceSample *samples, int capacity);
 void BKE_mesh_sample_storage_release(struct MSurfaceSampleStorage *storage);
 
diff --git a/source/blender/blenkernel/intern/mesh_sample.c b/source/blender/blenkernel/intern/mesh_sample.c
index 7dbbe88..664dfea 100644
--- a/source/blender/blenkernel/intern/mesh_sample.c
+++ b/source/blender/blenkernel/intern/mesh_sample.c
@@ -137,6 +137,15 @@ static bool mesh_sample_store_array_sample(void *vdata, int capacity, int index,
 	return true;
 }
 
+void BKE_mesh_sample_storage_single(MSurfaceSampleStorage *storage, MSurfaceSample *sample)
+{
+	/* handled as just a special array case with capacity = 1 */
+	storage->store_sample = mesh_sample_store_array_sample;
+	storage->capacity = 1;
+	storage->data = sample;
+	storage->free_data = false;
+}
+
 void BKE_mesh_sample_storage_array(MSurfaceSampleStorage *storage, MSurfaceSample *samples, int capacity)
 {
 	storage->store_sample = mesh_sample_store_array_sample;




More information about the Bf-blender-cvs mailing list