[Bf-blender-cvs] [6f268ac55d8] blender2.8: Merge branch 'master' into blender2.8

[Alexander Romanov]

Commit: 6f268ac55d834ca9ba098b321dc101fbba93d773
Author: Alexander Romanov
Date:   Thu Apr 13 13:02:39 2017 +0300
Branches: blender2.8
https://developer.blender.org/rB6f268ac55d834ca9ba098b321dc101fbba93d773

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/alembic/intern/abc_exporter.cc
index 61ad76b409c,39896529c97..1b218b98f21
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -365,13 -367,19 +365,15 @@@ void AbcExporter::createTransformWriter
  
  void AbcExporter::createTransformWritersFlat()
  {
 -	Base *base = static_cast<Base *>(m_scene->base.first);
 -
 -	while (base) {
 +	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
  		Object *ob = base->object;
  
 -		if (export_object(&m_settings, ob) && object_is_shape(ob)) {
 +		if (!export_object(&m_settings, base)) {
  			std::string name = get_id_name(ob);
- 			m_xforms[name] = new AbcTransformWriter(ob, m_writer->archive().getTop(), 0, m_trans_sampling_index, m_settings);
+ 			m_xforms[name] = new AbcTransformWriter(
+ 			                     ob, m_writer->archive().getTop(), NULL,
+ 			                     m_trans_sampling_index, m_settings);
  		}
 -
 -		base = base->next;
  	}
  }
  
diff --cc source/blender/alembic/intern/abc_util.h
index 7217d5d5cef,7bde9ac6e15..9fdcf5e701b
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@@ -54,10 -53,16 +54,15 @@@ std::string get_id_name(const ID * cons
  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(Object *obj, float r_transform_mat[4][4]);
+ 
+ typedef enum {
+ 	ABC_MATRIX_WORLD = 1,
+ 	ABC_MATRIX_LOCAL = 2,
+ } AbcMatrixMode;
+ void create_transform_matrix(Object *obj, float r_transform_mat[4][4], AbcMatrixMode mode);
  
  void split(const std::string &s, const char delim, std::vector<std::string> &tokens);
  
diff --cc source/blender/blenkernel/intern/library_query.c
index c9853f791ce,0616c614848..c6cb336382e
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -68,9 -69,9 +69,10 @@@
  #include "BLI_linklist_stack.h"
  
  #include "BKE_animsys.h"
 +#include "BKE_collection.h"
  #include "BKE_constraint.h"
  #include "BKE_fcurve.h"
+ #include "BKE_idprop.h"
  #include "BKE_library.h"
  #include "BKE_library_query.h"
  #include "BKE_main.h"
diff --cc source/blender/editors/object/object_relations.c
index 10439d49787,861e249b0ee..3f3c770dbe1
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@@ -73,9 -72,9 +73,10 @@@
  #include "BKE_global.h"
  #include "BKE_group.h"
  #include "BKE_fcurve.h"
+ #include "BKE_idprop.h"
  #include "BKE_lamp.h"
  #include "BKE_lattice.h"
 +#include "BKE_layer.h"
  #include "BKE_library.h"
  #include "BKE_library_query.h"
  #include "BKE_library_remap.h"