Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 12 Mar 2017 20:51:10 +0000 (07:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 12 Mar 2017 20:51:10 +0000 (07:51 +1100)
1  2 
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/editors/interface/interface_widgets.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_operators.c

Simple merge
index 45c31279b50bf9fcb7c30977938bbbe2d061d28f,61e7712150f62303c622e22fac7a191d183ff410..62e779e7fd685becb490f8dba237e18ca556d068
@@@ -341,11 -341,13 +341,11 @@@ void AbcExporter::operator()(Main *bmai
  
  void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
  {
-       for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -      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)) {
 +              if (export_object(&m_settings, base)) {
-                       switch(ob->type) {
+                       switch (ob->type) {
                                case OB_LAMP:
                                case OB_LATTICE:
                                case OB_MBALL:
  
  void AbcExporter::createTransformWritersFlat()
  {
-       for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -      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);
                }
@@@ -454,8 -460,13 +454,8 @@@ void AbcExporter::createTransformWriter
  
  void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx)
  {
-       for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -      Base *base = static_cast<Base *>(m_scene->base.first);
 -
 -      while (base) {
 -              Object *ob = base->object;
 -              exploreObject(eval_ctx, ob, NULL);
 -
 -              base = base->next;
++      for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 +              exploreObject(eval_ctx, base, NULL);
        }
  }