[Bf-blender-cvs] [b86996c] hair_system: Added a bool return to the eval function to give feedback on invalid samples.

[Lukas Tönne]

Commit: b86996c85b455b234cab52a7435073aa56243091
Author: Lukas Tönne
Date:   Tue Mar 4 13:41:01 2014 +0100
Branches: hair_system
https://developer.blender.org/rBb86996c85b455b234cab52a7435073aa56243091

Added a bool return to the eval function to give feedback on invalid
samples.

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

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 8d1ce65..6a0a892 100644
--- a/source/blender/blenkernel/BKE_mesh_sample.h
+++ b/source/blender/blenkernel/BKE_mesh_sample.h
@@ -31,7 +31,7 @@ struct MSurfaceSample;
 
 /* Evaluate */
 
-void BKE_mesh_sample_eval(struct DerivedMesh *dm, const struct MSurfaceSample 
*sample, float loc[3], float nor[3]);
+bool BKE_mesh_sample_eval(struct DerivedMesh *dm, const struct MSurfaceSample 
*sample, float loc[3], float nor[3]);
 
 
 /* Iterators */
diff --git a/source/blender/blenkernel/intern/mesh_sample.c 
b/source/blender/blenkernel/intern/mesh_sample.c
index 49e4486..a2454e8 100644
--- a/source/blender/blenkernel/intern/mesh_sample.c
+++ b/source/blender/blenkernel/intern/mesh_sample.c
@@ -41,7 +41,7 @@
 
 /* Evaluate */
 
-void BKE_mesh_sample_eval(DerivedMesh *dm, const MSurfaceSample *sample, float 
loc[3], float nor[3])
+bool BKE_mesh_sample_eval(DerivedMesh *dm, const MSurfaceSample *sample, float 
loc[3], float nor[3])
 {
        MVert *mverts = dm->getVertArray(dm);
        MVert *v1, *v2, *v3, *v4;
@@ -54,7 +54,7 @@ void BKE_mesh_sample_eval(DerivedMesh *dm, const 
MSurfaceSample *sample, float l
        zero_v3(nor);
        
        if (sample->orig_face >= totfaces)
-               return;
+               return false;
        
        v1 = &mverts[mface->v1];
        v2 = &mverts[mface->v2];
@@ -79,6 +79,8 @@ void BKE_mesh_sample_eval(DerivedMesh *dm, const 
MSurfaceSample *sample, float l
                normal_short_to_float_v3(vnor, v4->no);
                madd_v3_v3fl(nor, vnor, sample->orig_weights[3]);
        }
+       
+       return true;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs