[Bf-blender-cvs] [04c4368] bake-cycles: Cycles-Bake: reverting gibberish code I added earlier

[Dalai Felinto]

Commit: 04c436861caab5598cfa2fc9f50a9e99fe1bfa35
Author: Dalai Felinto
Date:   Tue Jan 14 18:59:39 2014 -0200
https://developer.blender.org/rB04c436861caab5598cfa2fc9f50a9e99fe1bfa35

Cycles-Bake: reverting gibberish code I added earlier

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

M	intern/cycles/render/mesh_displace.cpp

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

diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index 7d6c728..09d3ce6 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -26,18 +26,6 @@
 
 CCL_NAMESPACE_BEGIN
 
-#if 0
-struct BakePixel {
-	int primitive_id;
-	float u, v;
-	float dudx, dudy;
-	float dvdx, dvdy;
-};
-
-static void bake(Object *object, BakePixel pixel_array[], int num_pixels, int passes_bit_flag, float result[]);
-
-#endif
-
 bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Mesh *mesh, Progress& progress)
 {
 	/* verify if we have a displacement shader */
@@ -65,65 +53,6 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 		}
 	}
 
-#if 0
-	/* pseudo-setup for baking API */
-	vector<bool> done(mesh->verts.size(), false);
-	device_vector<BakePixel> d_input;
-	BakePixel *d_input_data = d_input.resize(mesh->verts.size());
-	size_t d_input_size = 0;
-
-	for (size_t i = 0; i < mesh->triangles.size(); i++) {
-		Mesh::Triangle t = mesh->triangles[i];
-		Shader *shader = scene->shaders[mesh->shader[i]];
-
-		if (!shader->has_displacement)
-			continue;
-
-		for (int j = 0; j < 3; j++) {
-			if (done[t.v[j]])
-				continue;
-
-			done[t.v[j]] = true;
-			int prim = mesh->tri_offset + i;
-			float u, v;
-
-			switch (j) {
-				case 0:
-					u = 1.0f;
-					v = 0.0f;
-					break;
-				case 1:
-					u = 0.0f;
-					v = 1.0f;
-					break;
-				default:
-					u = 0.0f;
-					v = 0.0f;
-					break;
-			}
-
-			/* back */
-			BakePixel in;
-			in.u = u;
-			in.v = v;
-			in.primitive_id = prim;
-			d_input_data[d_input_size++] = in;
-		}
-	}
-
-	if(d_input_size == 0)
-		return false;
-
-	/* run device task */
-	//device_vector<float4> d_output;
-	//d_output.resize(d_input_size);
-
-	device_vector<float> d_output;
-	d_output.resize(d_input_size * 4);
-
-	bake(scene->objects[object_index], d_input_data, (int) d_input_size, (int) SHADER_EVAL_DISPLACE, d_output);
-
-#else
 	/* setup input for device task */
 	vector<bool> done(mesh->verts.size(), false);
 	device_vector<uint4> d_input;
@@ -184,8 +113,6 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 	device->mem_copy_to(d_input);
 	device->mem_alloc(d_output, MEM_WRITE_ONLY);
 
-#endif
-
 	DeviceTask task(DeviceTask::SHADER);
 	task.shader_input = d_input.device_pointer;
 	task.shader_output = d_output.device_pointer;