[Bf-blender-cvs] [41732a7580c] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Bastien Montagne]

Commit: 41732a7580c056bc3e71471de333aebf5f4cefc8
Author: Bastien Montagne
Date:   Tue Jun 30 14:58:16 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB41732a7580c056bc3e71471de333aebf5f4cefc8

Merge branch 'master' into soc-2020-info-editor

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



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

diff --cc source/blender/makesdna/intern/dna_rename_defs.h
index 75f91a6be53,f2cf72843bd..08a80a764e5
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@@ -84,9 -87,10 +87,11 @@@ DNA_STRUCT_RENAME_ELEM(Object, size, sc
  DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection)
  DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object)
  DNA_STRUCT_RENAME_ELEM(ParticleSettings, dupliweights, instance_weights)
 +DNA_STRUCT_RENAME_ELEM(SpaceInfo, rpt_mask, report_mask_exclude)
+ DNA_STRUCT_RENAME_ELEM(Text, name, filepath)
  DNA_STRUCT_RENAME_ELEM(ThemeSpace, scrubbing_background, time_scrub_background)
  DNA_STRUCT_RENAME_ELEM(ThemeSpace, show_back_grad, background_type)
+ DNA_STRUCT_RENAME_ELEM(VFont, name, filepath)
  DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end)
  DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start)
  DNA_STRUCT_RENAME_ELEM(View3D, ob_centre, ob_center)