griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[#33955] Collada Model Import Hangs Blender. Optimized Object import for better performance. Added logging messages

Browse Source
This commit is contained in:
Gaia Clary
2013-02-08 19:52:02 +00:00
parent d26c063121
commit deeeaed3d8
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/collada/DocumentImporter.cpp
View File

@@ -76,6 +76,9 @@ extern "C" {
#include "MEM_guardedalloc.h"
#include "WM_api.h"
#include "WM_types.h"
}
#include "ExtraHandler.h"
@@ -207,6 +210,12 @@ void DocumentImporter::finish()
for (unsigned int i = 0; i < roots.getCount(); i++) {
write_node(roots[i], NULL, sce, NULL, false);
}
Main *bmain = CTX_data_main(mContext);
DAG_scene_sort(bmain, sce);
DAG_ids_flush_update(bmain, 0);
WM_event_add_notifier(mContext, NC_OBJECT | ND_TRANSFORM, NULL);
}
@@ -424,9 +433,16 @@ void DocumentImporter::write_node(COLLADAFW::Node *node, COLLADAFW::Node *parent
Object *ob = NULL;
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
bool read_transform = true;
std::string id = node->getOriginalId();
std::string name = node->getName();
std::vector<Object *> *objects_done = new std::vector<Object *>();
fprintf(stderr,
"Writing node id='%s', name='%s'\n",
id.c_str(),
name.c_str());
if (is_joint) {
armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce);
}
@@ -449,8 +465,6 @@ void DocumentImporter::write_node(COLLADAFW::Node *node, COLLADAFW::Node *parent
ob = mesh_importer.create_mesh_object(node, geom[geom_done], false, uid_material_map,
material_texture_mapping_map);
if (ob == NULL) {
std::string id = node->getOriginalId();
std::string name = node->getName();
fprintf(stderr,
"<node id=\"%s\", name=\"%s\" >...contains a reference to an unknown instance_mesh.\n",
id.c_str(),

3
source/blender/collada/collada_utils.cpp
View File

@@ -116,9 +116,12 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA;
par->recalc |= OB_RECALC_OB;
/** done once after import
DAG_scene_sort(bmain, sce);
DAG_ids_flush_update(bmain, 0);
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
*/
return true;
}