[Bf-blender-cvs] [be0c5a0d341] uvimage-editor-drawing: Merge branch 'master' into uvimage-editor-drawing

[Jeroen Bakker]

Commit: be0c5a0d341db394b578adf1181b7ae049ecab17
Author: Jeroen Bakker
Date:   Thu Sep 10 07:53:33 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBbe0c5a0d341db394b578adf1181b7ae049ecab17

Merge branch 'master' into uvimage-editor-drawing

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index 7a48655d6e1,589077ea67b..9b31b9d9eee
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -620,9 -620,9 +620,10 @@@ typedef struct UserDef_Experimental 
    char use_new_hair_type;
    char use_cycles_debug;
    char use_sculpt_vertex_colors;
 +  char use_drw_image_editor;
+   char use_tools_missing_icons;
    /** `makesdna` does not allow empty structs. */
-   char _pad0[2];
 -  char _pad[2];
++  char _pad[1];
  } UserDef_Experimental;
  
  #define USER_EXPERIMENTAL_TEST(userdef, member) \
diff --cc source/blender/makesrna/intern/rna_userdef.c
index a674edc8815,10e3f9c86ee..417b2dac40e
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -6123,10 -6118,9 +6123,14 @@@ static void rna_def_userdef_experimenta
    RNA_def_property_boolean_sdna(prop, NULL, "use_sculpt_vertex_colors", 1);
    RNA_def_property_ui_text(prop, "Sculpt Vertex Colors", "Use the new Vertex Painting system");
  
 +  prop = RNA_def_property(srna, "use_drw_image_editor", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "use_drw_image_editor", 1);
 +  RNA_def_property_ui_text(
 +      prop, "Image Editor Draw Engine", "Use draw manager for rendering the uv/image editor");
++
+   prop = RNA_def_property(srna, "use_tools_missing_icons", PROP_BOOLEAN, PROP_NONE);
+   RNA_def_property_boolean_sdna(prop, NULL, "use_tools_missing_icons", 1);
+   RNA_def_property_ui_text(prop, "Tools with Missing Icons", "Show tools with missing icons");
  }
  
  static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop)