[Bf-blender-cvs] [c9134d8] master: Cycles: Fix strict compilation warning

Sergey Sharybin noreply at git.blender.org
Fri Jul 29 15:06:26 CEST 2016


Commit: c9134d86f000908c22613c2bf44ec2bb679e4867
Author: Sergey Sharybin
Date:   Fri Jul 29 15:06:13 2016 +0200
Branches: master
https://developer.blender.org/rBc9134d86f000908c22613c2bf44ec2bb679e4867

Cycles: Fix strict compilation warning

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

M	intern/cycles/blender/blender_mesh.cpp

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

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index a8f006f..74fd4cb 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -766,7 +766,6 @@ static void create_subd_mesh(Scene *scene,
                              Mesh *mesh,
                              BL::Object& b_ob,
                              BL::Mesh& b_mesh,
-                             PointerRNA *cmesh,
                              const vector<Shader*>& used_shaders,
                              float dicing_rate,
                              int max_subdivisions)
@@ -954,7 +953,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
 		if(b_mesh) {
 			if(render_layer.use_surfaces && !hide_tris) {
 				if(mesh->subdivision_type != Mesh::SUBDIVISION_NONE)
-					create_subd_mesh(scene, mesh, b_ob, b_mesh, &cmesh, used_shaders,
+					create_subd_mesh(scene, mesh, b_ob, b_mesh, used_shaders,
 					                 dicing_rate, max_subdivisions);
 				else
 					create_mesh(scene, mesh, b_mesh, used_shaders, false);




More information about the Bf-blender-cvs mailing list