[Bf-blender-cvs] [2c2a898] bake-cycles: Cycles-Bake: UV baking

[Dalai Felinto]

Commit: 2c2a8986b40a81bf995c0bd7b269c0135adef947
Author: Dalai Felinto
Date:   Wed Jan 22 16:49:26 2014 -0200
https://developer.blender.org/rB2c2a8986b40a81bf995c0bd7b269c0135adef947

Cycles-Bake: UV baking

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

M	intern/cycles/blender/blender_session.cpp
M	intern/cycles/kernel/kernel_displace.h

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 19e6fd0..d891e93 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -576,6 +576,13 @@ void BlenderSession::bake(BL::Object b_object, const string& pass_type, BL::Bake
 		}
 	}
 
+	if (shader_type == SHADER_EVAL_UV) {
+		/* force UV to be available */
+		vector<Pass> passes;
+		Pass::add(PASS_UV, passes);
+		scene->film->tag_passes_update(scene, passes);
+	}
+
 	/* create device and update scene */
 	scene->film->tag_update(scene);
 	scene->integrator->tag_update(scene);
diff --git a/intern/cycles/kernel/kernel_displace.h b/intern/cycles/kernel/kernel_displace.h
index 852fd6f..9c50584 100644
--- a/intern/cycles/kernel/kernel_displace.h
+++ b/intern/cycles/kernel/kernel_displace.h
@@ -59,8 +59,6 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 		}
 		case SHADER_EVAL_UV:
 		{
-			/* XXX not working ... no idea why */
-			shader_eval_surface(kg, &sd, 0.f, 0, SHADER_CONTEXT_MAIN);
 			out = primitive_uv(kg, &sd);
 			break;
 		}