[Bf-blender-cvs] [da3523c] custom-manipulators: Fix compile issues after merging

[Julian Eisel]

Commit: da3523c48fb45827467a13732582623e84c93d6c
Author: Julian Eisel
Date:   Fri Dec 16 01:10:18 2016 +0100
Branches: custom-manipulators
https://developer.blender.org/rBda3523c48fb45827467a13732582623e84c93d6c

Fix compile issues after merging

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

M       source/blender/makesrna/intern/rna_object.c
M       source/blender/makesrna/intern/rna_wm_api.c

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

diff --git a/source/blender/makesrna/intern/rna_object.c 
b/source/blender/makesrna/intern/rna_object.c
index 6978dd0..7ae2612 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1715,14 +1715,14 @@ static void rna_def_face_map(BlenderRNA *brna)
        RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
        /* TODO, see how array size of 0 works, this shouldnt be used */
        prop = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index 
List", 0, 0);
-       RNA_def_property_flag(prop, PROP_DYNAMIC | PROP_REQUIRED);
+       RNA_def_parameter_flags(prop, PROP_DYNAMIC, PARM_REQUIRED);
 
        func = RNA_def_function(srna, "remove", "rna_FaceMap_face_remove");
        RNA_def_function_ui_description(func, "Remove a vertex from the group");
        RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
        /* TODO, see how array size of 0 works, this shouldnt be used */
        prop = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index 
List", 0, 0);
-       RNA_def_property_flag(prop, PROP_DYNAMIC | PROP_REQUIRED);
+       RNA_def_parameter_flags(prop, PROP_DYNAMIC, PARM_REQUIRED);
 }
 
 static void rna_def_material_slot(BlenderRNA *brna)
@@ -2263,7 +2263,7 @@ static void rna_def_object_face_maps(BlenderRNA *brna, 
PropertyRNA *cprop)
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
        RNA_def_function_ui_description(func, "Delete vertex group from 
object");
        parm = RNA_def_pointer(func, "group", "FaceMap", "", "Face map to 
remove");
-       RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | 
PROP_RNAPTR);
+       RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | 
PARM_RNAPTR);
        RNA_def_property_clear_flag(parm, PROP_THICK_WRAP);
 
        func = RNA_def_function(srna, "clear", "rna_Object_fmap_clear");
diff --git a/source/blender/makesrna/intern/rna_wm_api.c 
b/source/blender/makesrna/intern/rna_wm_api.c
index 73fa07b..ba59d52 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -647,18 +647,18 @@ void RNA_api_widgetgroup(StructRNA *srna)
        RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_REGISTER_OPTIONAL);
        RNA_def_function_return(func, RNA_def_boolean(func, "visible", 1, "", 
""));
        parm = RNA_def_pointer(func, "context", "Context", "", "");
-       RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
+       RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
 
        /* keymap_init */
        func = RNA_def_function(srna, "keymap_init", NULL);
        RNA_def_function_ui_description(func, "Initialize keymaps for this 
widget group");
        RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_REGISTER);
        parm = RNA_def_pointer(func, "keyconf", "KeyConfig", "", "");
-       RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
+       RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
        parm = RNA_def_property(func, "widget_group", PROP_STRING, PROP_NONE);
        RNA_def_property_ui_text(parm, "Widget Group", "Widget group id");
        // RNA_def_property_string_default(parm, "");
-       RNA_def_property_flag(parm, PROP_REQUIRED);
+       RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
 
        parm = RNA_def_pointer(func, "keymap", "KeyMap", "", "");
        RNA_def_property_flag(parm, PROP_NEVER_NULL);
@@ -669,7 +669,7 @@ void RNA_api_widgetgroup(StructRNA *srna)
        RNA_def_function_ui_description(func, "Draw function for the operator");
        RNA_def_function_flag(func, FUNC_REGISTER);
        parm = RNA_def_pointer(func, "context", "Context", "", "");
-       RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
+       RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
 }
 
 void RNA_api_keyconfig(StructRNA *UNUSED(srna))

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs