[Bf-blender-cvs] [48a6aa3499] blender2.8: Alembic: don't use parent_selected() to determine which object to export
Sybren A. Stüvel
noreply at git.blender.org
Fri Feb 10 11:53:30 CET 2017
Commit: 48a6aa3499566e17cbdde4246832bb79b02039d0
Author: Sybren A. Stüvel
Date: Thu Feb 9 14:41:35 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB48a6aa3499566e17cbdde4246832bb79b02039d0
Alembic: don't use parent_selected() to determine which object to export
The parent_selected() function mixed semantics of "needs to be exported"
and "is selected", which is confusing. Now just selected objects are
exported to Alembic; any parent transforms that are required were already
taken care of by other code.
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_util.cc
M source/blender/alembic/intern/abc_util.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 844079faa7..cf9498878c 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -125,7 +125,7 @@ static bool object_is_shape(Object *ob)
static bool export_object(const ExportSettings * const settings, Object *ob)
{
- if (settings->selected_only && !parent_selected(ob)) {
+ if (settings->selected_only && !object_selected(ob)) {
return false;
}
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 08c94f437e..73aeca1bfd 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -81,28 +81,6 @@ bool object_selected(Object *ob)
return ob->flag & SELECT;
}
-bool parent_selected(Object *ob)
-{
- if (object_selected(ob)) {
- return true;
- }
-
- bool do_export = false;
-
- Object *parent = ob->parent;
-
- while (parent != NULL) {
- if (object_selected(parent)) {
- do_export = true;
- break;
- }
-
- parent = parent->parent;
- }
-
- return do_export;
-}
-
Imath::M44d convert_matrix(float mat[4][4])
{
Imath::M44d m;
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index a7ac9df91c..52e9fb93a6 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -49,7 +49,6 @@ std::string get_id_name(Object *ob);
std::string get_object_dag_path_name(Object *ob, Object *dupli_parent);
bool object_selected(Object *ob);
-bool parent_selected(Object *ob);
Imath::M44d convert_matrix(float mat[4][4]);
void create_transform_matrix(float r_mat[4][4]);
More information about the Bf-blender-cvs
mailing list