[Bf-blender-cvs] [26549b5ba27] datablock_idprops: Cleanup: simpler to define 'no datablock idprop' flag in RNA struct definitions.

[Bastien Montagne]

Commit: 26549b5ba2734f13883f38d6489bf1c9fad209e4
Author: Bastien Montagne
Date:   Fri Mar 31 15:27:56 2017 +0200
Branches: datablock_idprops
https://developer.blender.org/rB26549b5ba2734f13883f38d6489bf1c9fad209e4

Cleanup: simpler to define 'no datablock idprop' flag in RNA struct definitions.

That's cleaner & easier to read than to do it for every child class in
register functions...

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

M	source/blender/makesrna/intern/rna_ui.c
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 5999c64d9c9..54b82fc89d6 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -511,8 +511,6 @@ static StructRNA *rna_UIList_register(Main *bmain, ReportList *reports, void *da
 	/* update while blender is running */
 	WM_main_add_notifier(NC_WINDOW, NULL);
 
-	RNA_def_struct_flag(ult->ext.srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);
-
 	return ult->ext.srna;
 }
 
@@ -1041,6 +1039,7 @@ static void rna_def_uilist(BlenderRNA *brna)
 	RNA_def_struct_refine_func(srna, "rna_UIList_refine");
 	RNA_def_struct_register_funcs(srna, "rna_UIList_register", "rna_UIList_unregister", NULL);
 	RNA_def_struct_idprops_func(srna, "rna_UIList_idprops");
+	RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);
 
 	/* Registration */
 	prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 2ac3dc2d176..d1e89ea18d0 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -654,7 +654,6 @@ static StructRNA *rna_AddonPref_register(Main *bmain, ReportList *reports, void
 	apt->ext.call = call;
 	apt->ext.free = free;
 	RNA_struct_blender_type_set(apt->ext.srna, apt);
-	RNA_def_struct_flag(apt->ext.srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);
 
 //	apt->draw = (have_function[0]) ? header_draw : NULL;
 
@@ -3157,6 +3156,7 @@ static void rna_def_userdef_addon_pref(BlenderRNA *brna)
 	RNA_def_struct_refine_func(srna, "rna_AddonPref_refine");
 	RNA_def_struct_register_funcs(srna, "rna_AddonPref_register", "rna_AddonPref_unregister", NULL);
 	RNA_def_struct_idprops_func(srna, "rna_AddonPref_idprops");
+	RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);  /* Mandatory! */
 
 	/* registration */
 	RNA_define_verify_sdna(0);
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 35c9c9bcc89..b458b2e69d5 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1556,6 +1556,7 @@ static void rna_def_operator(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Operator Properties", "Input properties of an Operator");
 	RNA_def_struct_refine_func(srna, "rna_OperatorProperties_refine");
 	RNA_def_struct_idprops_func(srna, "rna_OperatorProperties_idprops");
+	RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);
 }
 
 static void rna_def_macro_operator(BlenderRNA *brna)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 3403d9aec46..d827ccafda8 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -188,7 +188,6 @@ void WM_operatortype_append_ptr(void (*opfunc)(wmOperatorType *, void *), void *
 
 	ot = MEM_callocN(sizeof(wmOperatorType), "operatortype");
 	ot->srna = RNA_def_struct_ptr(&BLENDER_RNA, "", &RNA_OperatorProperties);
-	RNA_def_struct_flag(ot->srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);
 	/* Set the default i18n context now, so that opfunc can redefine it if needed! */
 	RNA_def_struct_translation_context(ot->srna, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
 	ot->translation_context = BLT_I18NCONTEXT_OPERATOR_DEFAULT;