Differential D7589 Diff 24327 source/blender/io/collada/ArmatureImporter.cpp

Changeset View

Standalone View

source/blender/io/collada/ArmatureImporter.cpp

Context not available.
	arm->layer \|= layer; // ensure that all populated bone layers are visible after import	arm->layer \|= layer; // ensure that all populated bone layers are visible after import

	float *tail = be.get_tail();	float *tail = be.get_tail();
	int use_connect = be.get_use_connect();

	switch (use_connect) {
	case 1:
	bone->flag \|= BONE_CONNECTED;
	break;
	case -1: /* Connect type not specified */
	case 0:
	bone->flag &= ~BONE_CONNECTED;
	break;
	}

	if (be.has_roll()) {	if (be.has_roll()) {
	bone->roll = be.get_roll();	bone->roll = be.get_roll();
Context not available.
	}	}

	add_v3_v3v3(bone->tail, bone->head, tail); /* tail must be non zero */	add_v3_v3v3(bone->tail, bone->head, tail); /* tail must be non zero */

		gaiaclaryUnsubmitted Not Done Inline Actions Just curious: Why is this code moved down from its previous location? gaiaclary: Just curious: Why is this code moved down from its previous location?
		// Set use connect flag if the document said to use it, otherwise ensure the flag is cleared
		bool use_connect = be.get_use_connect();

		if (use_connect) {
		bone->flag \|= BONE_CONNECTED;
		}
		else {
		bone->flag &= ~BONE_CONNECTED;
		}

	/* find smallest bone length in armature (used later for leaf bone length) */	/* find smallest bone length in armature (used later for leaf bone length) */
	if (parent) {	if (parent) {

	if (use_connect == 1) {	if (use_connect) {
	copy_v3_v3(parent->tail, bone->head);	copy_v3_v3(parent->tail, bone->head);
	}	}

Context not available.
	finished_joints.push_back(node);	finished_joints.push_back(node);

	be.set_chain_length(chain_length + 1);	be.set_chain_length(chain_length + 1);

		// Set scale inherit mode
		bone->inherit_scale_mode = be.get_inherit_scale();

		// Set local location flag if the document said to use it, otherwise ensure the flag is cleared
		if (be.get_use_local_location()) {
		bone->flag \|= BONE_NO_LOCAL_LOCATION;
		}
		else {
		bone->flag &= ~BONE_NO_LOCAL_LOCATION;
		}

	return chain_length + 1;	return chain_length + 1;
	}	}
Context not available.
	TagsMap::iterator etit;	TagsMap::iterator etit;
	ExtraTags *et = 0;	ExtraTags *et = 0;
	etit = uid_tags_map.find(node->getUniqueId().toAscii());	etit = uid_tags_map.find(node->getUniqueId().toAscii());

	bool has_connect = false;	bool use_connect = false;
	int connect_type = -1;	bool has_use_connect = false;

	if (etit != uid_tags_map.end()) {	if (etit != uid_tags_map.end()) {

	float tail[3] = {FLT_MAX, FLT_MAX, FLT_MAX};	float tail[3] = {FLT_MAX, FLT_MAX, FLT_MAX};
	float roll = 0;	float roll = 0;
	std::string layers;

	et = etit->second;	et = etit->second;

Context not available.
	has_tail \|= et->setData("tip_x", &tail[0]);	has_tail \|= et->setData("tip_x", &tail[0]);
	has_tail \|= et->setData("tip_y", &tail[1]);	has_tail \|= et->setData("tip_y", &tail[1]);
	has_tail \|= et->setData("tip_z", &tail[2]);	has_tail \|= et->setData("tip_z", &tail[2]);

	has_connect = et->setData("connect", &connect_type);	// Import roll and layer data from document, if present
		std::string layers = et->setData("layer", layers);
	bool has_roll = et->setData("roll", &roll);	bool has_roll = et->setData("roll", &roll);

	layers = et->setData("layer", layers);

	if (has_tail && !has_connect) {
	/* got a bone tail definition but no connect info -> bone is not connected */
	has_connect = true;
	connect_type = 0;
	}

	be->set_bone_layers(layers, layer_labels);	be->set_bone_layers(layers, layer_labels);
	if (has_tail) {	if (has_tail) {
	be->set_tail(tail);	be->set_tail(tail);
Context not available.
	if (has_roll) {	if (has_roll) {
	be->set_roll(roll);	be->set_roll(roll);
	}	}

		// Import use connect setting from document, if present
		use_connect = false;
		has_use_connect = et->setData("connect", &use_connect);

		// If there is tail information but no use_connect setting, force use_connect to be false.
		if (has_tail && !has_use_connect) {
		has_use_connect = true;
		use_connect = false;
		}
	}	}

	if (!has_connect && this->import_settings->auto_connect) {	// If no use_connect setting is supplied (either from the document or from having a tail)
	/* auto connect only whyen parent has exactly one child*/	// and the user requested auto-connection, set use_connect to true if this bone is the
	connect_type = sibcount == 1;	// only child of its parent.
		if (!has_use_connect && this->import_settings->auto_connect) {
		use_connect = sibcount == 1;
	}	}

	be->set_use_connect(connect_type);	be->set_use_connect(use_connect);
	be->set_leaf_bone(true);	be->set_leaf_bone(true);

		// Import scale inheritance setting from document, if present
		int scale_inherit_type = eBone_InheritScaleMode::BONE_INHERIT_SCALE_FULL;

		bool has_scale = et->setData("inherit_scale", &scale_inherit_type);
		if (has_scale) {
		be->set_inherit_scale((eBone_InheritScaleMode)scale_inherit_type);
		}

		// Import local location setting from document, if present
		bool use_local_location = false;

		bool has_local_location = et->setData("use_local_location", &use_local_location);
		if (has_local_location) {
		be->set_use_local_location(use_local_location);
		}

	return *be;	return *be;
	}	}
Context not available.