Merge branch 'master' into blender2.8
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/ Conflicts: intern/ghost/intern/GHOST_WindowWin32.cpp source/blender/blenkernel/BKE_effect.h source/blender/blenkernel/BKE_pointcache.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/effect.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/pointcache.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/blenkernel/intern/softbody.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/gpu/intern/gpu_debug.c source/blender/makesdna/DNA_object_types.h source/blender/makesrna/intern/rna_particle.c
This commit is contained in:
@@ -306,7 +306,12 @@ bool KX_NavMeshObject::BuildNavMesh()
|
||||
|| vertsPerPoly<3)
|
||||
{
|
||||
printf("Can't build navigation mesh data for object:%s\n", m_name.ReadPtr());
|
||||
if (vertices) delete[] vertices;
|
||||
if (vertices) {
|
||||
delete[] vertices;
|
||||
}
|
||||
if (dvertices) {
|
||||
delete[] dvertices;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user