[Bf-blender-cvs] [9649c6bef54] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9649c6bef548a799ea620a4ac1abce7935849f2e
Author: Campbell Barton
Date:   Mon Jun 19 15:06:48 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB9649c6bef548a799ea620a4ac1abce7935849f2e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/alembic/intern/abc_exporter.cc
index e3dd2b968be,4fe65b96f36..680913e45ea
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -131,15 -131,14 +131,14 @@@ static bool object_type_is_exportable(O
  /**
   * Returns whether this object should be exported into the Alembic file.
   *
-  * @param settings export settings, used for options like 'selected only'.
-  * @param ob the object's base in question.
-  * @param is_duplicated normally false; true when the object is instanced
-  *                      into the scene by a dupli-object (e.g. part of a
-  *                      dupligroup). This ignores selection and layer
-  *                      visibility, and assumes that the dupli-object itself
-  *                      (e.g. the group-instantiating empty) is exported.
 - * \param settings: export settings, used for options like 'selected only'.
 - * \param ob: the object in question.
++ * \param settings export settings, used for options like 'selected only'.
++ * \param ob the object's base in question.
+  * \param is_duplicated: Normally false; true when the object is instanced
+  * into the scene by a dupli-object (e.g. part of a dupligroup).
+  * This ignores selection and layer visibility,
+  * and assumes that the dupli-object itself (e.g. the group-instantiating empty) is exported.
   */
 -static bool export_object(const ExportSettings * const settings, Object *ob,
 +static bool export_object(const ExportSettings * const settings, const Base * const ob_base,
                            bool is_duplicated)
  {
  	if (!is_duplicated) {
diff --cc source/blender/blenlib/intern/math_matrix.c
index 1883b62f532,f47f9ad76e6..7677d545e07
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@@ -1809,12 -1744,12 +1809,12 @@@ void blend_m4_m4m4(float out[4][4], con
   *
   * Based on "Matrix Animation and Polar Decomposition", by Ken Shoemake & Tom Duff
   *
-  * @return R the interpolated matrix.
-  * @param A the intput matrix which is totally effective with \a t = 0.0.
-  * @param B the intput matrix which is totally effective with \a t = 1.0.
-  * @param t the interpolation factor.
+  * \param R: Resulting interpolated matrix.
+  * \param A: Input matrix which is totally effective with `t = 0.0`.
+  * \param B: Input matrix which is totally effective with `t = 1.0`.
+  * \param t: Interpolation factor.
   */
 -void interp_m3_m3m3(float R[3][3], float A[3][3], float B[3][3], const float t)
 +void interp_m3_m3m3(float R[3][3], const float A[3][3], const float B[3][3], const float t)
  {
  	/* 'Rotation' component ('U' part of polar decomposition, the closest orthogonal matrix to M3 rot/scale
  	 * transformation matrix), spherically interpolated. */
@@@ -1842,14 -1777,14 +1842,14 @@@
  }
  
  /**
-  * Complete transform matrix interpolation, based on polar-decomposition-based interpolation from interp_m3_m3m3.
+  * Complete transform matrix interpolation, based on polar-decomposition-based interpolation from #interp_m3_m3m3.
   *
-  * @return R the interpolated matrix.
-  * @param A the intput matrix which is totally effective with \a t = 0.0.
-  * @param B the intput matrix which is totally effective with \a t = 1.0.
-  * @param t the interpolation factor.
+  * \param R: Resulting interpolated matrix.
+  * \param A: Input matrix which is totally effective with `t = 0.0`.
+  * \param B: Input matrix which is totally effective with `t = 1.0`.
+  * \param t: Interpolation factor.
   */
 -void interp_m4_m4m4(float R[4][4], float A[4][4], float B[4][4], const float t)
 +void interp_m4_m4m4(float R[4][4], const float A[4][4], const float B[4][4], const float t)
  {
  	float A3[3][3], B3[3][3], R3[3][3];
  
diff --cc source/blender/editors/space_node/space_node.c
index 2f1e6d38d3d,2267316d257..c1099f38d92
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@@ -777,18 -753,11 +777,22 @@@ static void node_region_listener
  					break;
  			}
  			break;
+ 		case NC_WM:
+ 			if (wmn->data == ND_JOB)
+ 				ED_region_tag_redraw(ar);
+ 			break;
  		case NC_SCENE:
 +			ED_region_tag_redraw(ar);
 +			if (wmn->data == ND_RENDER_RESULT) {
 +				WM_manipulatormap_tag_refresh(mmap);
 +			}
 +			break;
 +		case NC_NODE:
 +			ED_region_tag_redraw(ar);
 +			if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) {
 +				WM_manipulatormap_tag_refresh(mmap);
 +			}
 +			break;
  		case NC_MATERIAL:
  		case NC_TEXTURE:
  		case NC_WORLD: