[Bf-blender-cvs] [f386f57] master: Cycles: Only report exporting curves if there are particle systems on the object

Sergey Sharybin noreply at git.blender.org
Fri Nov 28 12:17:22 CET 2014


Commit: f386f574b13de73347236730ba5703b08bab14c6
Author: Sergey Sharybin
Date:   Fri Nov 28 16:13:00 2014 +0500
Branches: master
https://developer.blender.org/rBf386f574b13de73347236730ba5703b08bab14c6

Cycles: Only report exporting curves if there are particle systems on the object

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

M	intern/cycles/blender/blender_curves.cpp

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

diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index f010a24..7c8e7d4 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -556,7 +556,6 @@ void ExportCurveTriangleGeometry(Mesh *mesh, ParticleCurveData *CData, int resol
 
 void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
 {
-	VLOG(1) << "Exporting curve segments for mesh " << mesh->name;
 	int num_keys = 0;
 	int num_curves = 0;
 
@@ -579,6 +578,10 @@ void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
 		}
 	}
 
+	if (num_curves > 0) {
+		VLOG(1) << "Exporting curve segments for mesh " << mesh->name;
+	}
+
 	mesh->curve_keys.reserve(mesh->curve_keys.size() + num_keys);
 	mesh->curves.reserve(mesh->curves.size() + num_curves);
 
@@ -614,9 +617,9 @@ void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
 		}
 	}
 
-	/* check allocation*/
+	/* check allocation */
 	if((mesh->curve_keys.size() !=  num_keys) || (mesh->curves.size() !=  num_curves)) {
-		/* allocation failed -> clear data */
+		VLOG(1) << "Allocation failed, clearing data";
 		mesh->curve_keys.clear();
 		mesh->curves.clear();
 		mesh->curve_attributes.clear();




More information about the Bf-blender-cvs mailing list