Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Jul 2017 10:19:59 +0000 (12:19 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 6 Jul 2017 10:21:21 +0000 (12:21 +0200)
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp
source/blender/editors/transform/transform_conversions.c

Simple merge
index cfc648e1fd03e08d7f9f4f108baf3bb47bc17a08,b7a42121e927bc3c0ed5e4179a1322c8781cfd75..5b48f4326e85a5ae3570ae5da43442947bb8e8e2
@@@ -818,8 -831,19 +832,14 @@@ void transform_autoik_update(TransInfo 
                return;
  
        /* apply to all pose-channels */
+       bool changed = false;
        for (pchan = t->poseobj->pose->chanbase.first; pchan; pchan = pchan->next) {
-               pchan_autoik_adjust(pchan, *chainlen);
+               changed |= pchan_autoik_adjust(pchan, *chainlen);
+       }
 -#ifdef WITH_LEGACY_DEPSGRAPH
 -      if (!DEG_depsgraph_use_legacy())
 -#endif
 -      {
 -              if (changed) {
 -                      /* TODO(sergey): Consider doing partial update only. */
 -                      DAG_relations_tag_update(G.main);
 -              }
++      if (changed) {
++              /* TODO(sergey): Consider doing partial update only. */
++              DEG_relations_tag_update(G.main);
        }
  }