Commit: 063bae4fcc079d0ba7b7f86d327179df36a95146
Author: Sybren A. Stüvel
Date: Fri Apr 7 17:28:22 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB063bae4fcc079d0ba7b7f86d327179df36a95146
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/abc_util.cc
===================================================================
===================================================================
diff --cc build_files/cmake/macros.cmake
index 7b47578cbc7,b7f6649e507..27728917af5
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -595,10 -595,9 +595,11 @@@ function(SETUP_BLENDER_SORTED_LIBS
bf_freestyle
bf_ikplugin
bf_modifiers
+ bf_alembic
bf_bmesh
bf_gpu
+ bf_draw
+ bf_intern_gawain
bf_blenloader
bf_blenkernel
bf_physics
diff --cc source/blender/alembic/intern/abc_exporter.h
index cf2a3432da9,0f08037fd17..f0e8e6b6815
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@@ -110,11 -110,11 +113,11 @@@ private
void createTransformWritersHierarchy(EvaluationContext *eval_ctx);
void createTransformWritersFlat();
- void createTransformWriter(Object *ob, Object *parent, Object
*dupliObParent);
+ AbcTransformWriter * createTransformWriter(Object *ob, Object *parent,
Object *dupliObParent);
- void exploreTransform(EvaluationContext *eval_ctx, Object *ob, Object
*parent, Object *dupliObParent = NULL);
- void exploreObject(EvaluationContext *eval_ctx, Object *ob, Object
*dupliObParent);
+ void exploreTransform(EvaluationContext *eval_ctx, Base *ob_base,
Object *parent, Object *dupliObParent);
+ void exploreObject(EvaluationContext *eval_ctx, Base *ob_base, Object
*dupliObParent);
void createShapeWriters(EvaluationContext *eval_ctx);
- void createShapeWriter(Object *ob, Object *dupliObParent);
+ void createShapeWriter(Base *ob_base, Object *dupliObParent);
AbcTransformWriter *getXForm(const std::string &name);
diff --cc source/blender/alembic/intern/abc_util.cc
index 41cc53b0716,224e0eccd00..b99be718c18
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@@ -61,17 -60,7 +61,16 @@@ std::string get_id_name(const ID * cons
return name;
}
-
+/**
+ * @brief get_object_dag_path_name returns the name under which the object
+ * will be exported in the Alembic file. It is of the form
+ * "[../grandparent/]parent/object" if dupli_parent is NULL, or
+ * "dupli_parent/[../grandparent/]parent/object" otherwise.
+ * @param ob
+ * @param dupli_parent
+ * @return
+ */
- std::string get_object_dag_path_name(Object *ob, Object *dupli_parent)
+ std::string get_object_dag_path_name(const Object * const ob, Object
*dupli_parent)
{
std::string name = get_id_name(ob);
diff --cc source/blender/alembic/intern/abc_util.h
index ab2cce59afa,5b53c86a859..7217d5d5cef
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@@ -43,17 -48,16 +48,16 @@@ struct ImportSettings
struct ID;
struct Object;
+struct Base;
- std::string get_id_name(ID *id);
- std::string get_id_name(Object *ob);
- std::string get_object_dag_path_name(Object *ob, Object *dupli_parent);
+ std::string get_id_name(const ID * const id);
+ std::string get_id_name(const Object * const ob);
+ std::string get_object_dag_path_name(const Object * const ob, Object
*dupli_parent);
-bool object_selected(Object *ob);
-bool parent_selected(Object *ob);
+bool object_selected(const Base * const ob_base);
Imath::M44d convert_matrix(float mat[4][4]);
- void create_transform_matrix(float r_mat[4][4]);
- void create_transform_matrix(Object *obj, float transform_mat[4][4]);
+ void create_transform_matrix(Object *obj, float r_transform_mat[4][4]);
void split(const std::string &s, const char delim, std::vector<std::string>
&tokens);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
