[Bf-blender-cvs] [becc643] gooseberry: Fix for invalid ob->data access in case non-mesh objects are in the cached group.

[Lukas Tönne]

Commit: becc6432b56fed5ed5d1931d6269b7658f8f1b2d
Author: Lukas Tönne
Date:   Wed Mar 11 11:42:49 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBbecc6432b56fed5ed5d1931d6269b7658f8f1b2d

Fix for invalid ob->data access in case non-mesh objects are in the
cached group.

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

M	source/blender/pointcache/intern/export.cpp

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

diff --git a/source/blender/pointcache/intern/export.cpp b/source/blender/pointcache/intern/export.cpp
index 7f49c5a..67a2fb7 100644
--- a/source/blender/pointcache/intern/export.cpp
+++ b/source/blender/pointcache/intern/export.cpp
@@ -59,7 +59,7 @@ void Exporter::set_bake_object(Object *ob, DerivedMesh **render_dm_ptr, CacheMod
 	*cachemd_ptr = cachemd;
 	
 	/* construct the correct DM based on evaluation mode */
-	if (use_render) {
+	if (use_render && ob->type == OB_MESH && ob->data) {
 		/* tell the modifier to store a copy of the DM for us */
 		if (cachemd)
 			cachemd->flag |= MOD_CACHE_USE_OUTPUT_RENDER;