[Bf-blender-cvs] [8021323] cycles-ptex-24: Temporary hack to ensure packed image pointer

[Nicholas Bishop]

Commit: 8021323ca23cd2bb85cf40481e5ce7e76ff7bded
Author: Nicholas Bishop
Date:   Sun Jan 25 22:48:39 2015 +0100
Branches: cycles-ptex-24
https://developer.blender.org/rB8021323ca23cd2bb85cf40481e5ce7e76ff7bded

Temporary hack to ensure packed image pointer

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

M	source/blender/blenkernel/intern/mesh.c

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

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 8ad20df..a47f289 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2239,6 +2239,9 @@ Mesh *BKE_mesh_new_from_object(
 				if (calc_undeformed)
 					mask |= CD_MASK_ORCO;
 
+				// TODO
+				mask |= CD_LOOP_PTEX;
+
 				/* Write the display mesh into the dummy mesh */
 				if (render)
 					dm = mesh_create_derived_render(sce, ob, mask);
@@ -2248,6 +2251,18 @@ Mesh *BKE_mesh_new_from_object(
 				tmpmesh = BKE_mesh_add(bmain, "Mesh");
 				DM_to_mesh(dm, tmpmesh, ob, mask);
 				dm->release(dm);
+
+				// TODO: very TODO
+				{
+					MLoopPtex *dst_loop_ptex = CustomData_get_layer
+						(&tmpmesh->ldata, CD_LOOP_PTEX);
+					Mesh *src_me = ob->data;
+					MLoopPtex *src_loop_ptex = CustomData_get_layer
+						(&src_me->ldata, CD_LOOP_PTEX);
+					if (src_loop_ptex && dst_loop_ptex) {
+						dst_loop_ptex[0].image = src_loop_ptex[0].image;
+					}
+				}
 			}
 
 			/* BKE_mesh_add/copy gives us a user count we don't need */