Merge branch 'master' into blender2.8
authorAlexander Romanov <a.romanov@blend4web.com>
Thu, 13 Apr 2017 10:02:39 +0000 (13:02 +0300)
committerAlexander Romanov <a.romanov@blend4web.com>
Thu, 13 Apr 2017 10:02:39 +0000 (13:02 +0300)
20 files changed:
1  2 
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_relations.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_internal.h
tests/python/CMakeLists.txt

index 61ad76b409c94816cc38b43a0c34218b3a21df04,39896529c97092cb44246a04243d858dd0bc1dc3..1b218b98f21b1781d960f0b854bda6cc2f7aba37
@@@ -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;
        }
  }
  
index 7217d5d5cef4393ccdf4ea1aa0f5ef96125c2438,7bde9ac6e152678be1fb79f646070042305f2577..9fdcf5e701b6a991ec327a5905a4b2817c4d4b2b
@@@ -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);
  
index c9853f791cecc004f3054bc9996df8d4ebf3e59a,0616c61484821ab9263e606309e5fd74442d7674..c6cb336382e7edbf887b2328fef213f5177ae947
  #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"
index 10439d49787040ae1d039c73287659651cbeebfe,861e249b0eecdfb521a1c0ec53acc0ffb0290a13..3f3c770dbe16765fc8e372a5c037d54bada21986
  #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"
Simple merge
Simple merge
Simple merge