[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44522] trunk/blender/intern/cycles/render : Cycles: fix msvc compile warning, patch by Jason Wilkins.

[Brecht Van Lommel]

Revision: 44522
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44522
Author:   blendix
Date:     2012-02-28 16:45:01 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Cycles: fix msvc compile warning, patch by Jason Wilkins.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/attribute.cpp
    trunk/blender/intern/cycles/render/attribute.h
    trunk/blender/intern/cycles/render/mesh.cpp

Modified: trunk/blender/intern/cycles/render/attribute.cpp
===================================================================
--- trunk/blender/intern/cycles/render/attribute.cpp	2012-02-28 16:44:54 UTC (rev 44521)
+++ trunk/blender/intern/cycles/render/attribute.cpp	2012-02-28 16:45:01 UTC (rev 44522)
@@ -101,9 +101,9 @@
 
 /* Attribute Set */
 
-AttributeSet::AttributeSet(Mesh *mesh_)
+AttributeSet::AttributeSet()
 {
-	mesh = mesh_;
+	mesh = NULL;
 }
 
 AttributeSet::~AttributeSet()
@@ -133,7 +133,8 @@
 	else if(element == Attribute::CORNER)
 		attr->set(name, type, element);
 	
-	attr->reserve(mesh->verts.size(), mesh->triangles.size());
+	if(mesh)
+		attr->reserve(mesh->verts.size(), mesh->triangles.size());
 	
 	return attr;
 }

Modified: trunk/blender/intern/cycles/render/attribute.h
===================================================================
--- trunk/blender/intern/cycles/render/attribute.h	2012-02-28 16:44:54 UTC (rev 44521)
+++ trunk/blender/intern/cycles/render/attribute.h	2012-02-28 16:45:01 UTC (rev 44522)
@@ -94,7 +94,7 @@
 	Mesh *mesh;
 	list<Attribute> attributes;
 
-	AttributeSet(Mesh *mesh);
+	AttributeSet();
 	~AttributeSet();
 
 	Attribute *add(ustring name, TypeDesc type, Attribute::Element element);

Modified: trunk/blender/intern/cycles/render/mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/render/mesh.cpp	2012-02-28 16:44:54 UTC (rev 44521)
+++ trunk/blender/intern/cycles/render/mesh.cpp	2012-02-28 16:45:01 UTC (rev 44522)
@@ -38,7 +38,6 @@
 /* Mesh */
 
 Mesh::Mesh()
-: attributes(this)
 {
 	need_update = true;
 	transform_applied = false;
@@ -49,6 +48,8 @@
 
 	tri_offset = 0;
 	vert_offset = 0;
+
+	attributes.mesh = this;
 }
 
 Mesh::~Mesh()