[Bf-extensions-cvs] [6a1ce200] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 6a1ce20043860e4f836294d46a86b5fcf7fbf1a8
Author: Campbell Barton
Date:   Wed Dec 19 11:56:05 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBA6a1ce20043860e4f836294d46a86b5fcf7fbf1a8

Merge branch 'master' into blender2.8

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



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

diff --cc io_import_images_as_planes.py
index 2b57c676,a4aa98f2..88cee32a
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@@ -1040,9 -1092,9 +1040,9 @@@ class IMPORT_IMAGE_OT_to_plane(Operator
  
          # Create new mesh
          bpy.ops.mesh.primitive_plane_add('INVOKE_REGION_WIN')
 -        plane = context.scene.objects.active
 +        plane = context.active_object
          # Why does mesh.primitive_plane_add leave the object in edit mode???
-         if plane.mode is not 'OBJECT':
+         if plane.mode != 'OBJECT':
              bpy.ops.object.mode_set(mode='OBJECT')
          plane.dimensions = width, height, 0.0
          plane.data.name = plane.name = name