sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: fix msvc compile warning, patch by Jason Wilkins.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-02-28 16:45:01 +00:00
parent 4a90339519
commit 6cb896ff0a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/attribute.cpp
View File

@ -101,9 +101,9 @@ ustring Attribute::standard_name(Attribute::Standard std)
/* Attribute Set */
AttributeSet::AttributeSet(Mesh *mesh_)
AttributeSet::AttributeSet()
{
mesh = mesh_;
mesh = NULL;
}
AttributeSet::~AttributeSet()
@ -133,6 +133,7 @@ Attribute *AttributeSet::add(ustring name, TypeDesc type, Attribute::Element ele
else if(element == Attribute::CORNER)
attr->set(name, type, element);
if(mesh)
attr->reserve(mesh->verts.size(), mesh->triangles.size());
return attr;

2
intern/cycles/render/attribute.h
View File

@ -94,7 +94,7 @@ public:
Mesh *mesh;
list<Attribute> attributes;
AttributeSet(Mesh *mesh);
AttributeSet();
~AttributeSet();
Attribute *add(ustring name, TypeDesc type, Attribute::Element element);

3
intern/cycles/render/mesh.cpp
View File

@ -38,7 +38,6 @@ CCL_NAMESPACE_BEGIN
/* Mesh */
Mesh::Mesh()
: attributes(this)
{
need_update = true;
transform_applied = false;
@ -49,6 +48,8 @@ Mesh::Mesh()
tri_offset = 0;
vert_offset = 0;
attributes.mesh = this;
}
Mesh::~Mesh()