[Bf-blender-cvs] [ca36091] master: correction to last commit

Campbell Barton noreply at git.blender.org
Wed Dec 25 22:38:49 CET 2013


Commit: ca3609126624a937c493f187c94289c9676f20dd
Author: Campbell Barton
Date:   Thu Dec 26 08:37:28 2013 +1100
https://developer.blender.org/rBca3609126624a937c493f187c94289c9676f20dd

correction to last commit

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

M	source/gameengine/Converter/BL_BlenderDataConversion.cpp

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

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index a7d6fcb..9dfad5b 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -941,7 +941,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene,
 
 	// Without checking names, we get some reuse we don't want that can cause
 	// problems with material LoDs.
-	if ((meshobj = converter->FindGameMesh(mesh/*, ob->lay*/)) != NULL) {
+	if (blenderobj && ((meshobj = converter->FindGameMesh(mesh/*, ob->lay*/)) != NULL)) {
 		const char *bge_name = meshobj->GetName().ReadPtr();
 		const char *blender_name = ((ID *)blenderobj->data)->name + 2;
 		if (STREQ(bge_name, blender_name)) {




More information about the Bf-blender-cvs mailing list