diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
| commit | 06aee2ef0e1c810c24b2559838e46045d708b22f (patch) | |
| tree | 795408b02937d52440bfcd6fc1aa7a4da8f431d1 /source/blender/makesrna/intern/rna_main_api.c | |
| parent | 8c4e95da48b3b896f012d7a1b7c89841270c40c6 (diff) | |
misc warnings/fixes
- WITH_OPENJPEG wasn't defined for creator.c with CMake.
- remove shadowed/redefined vars.
- remove some unused RNA report args.
- re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 56c2f44ed73..ce9785819ca 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -394,7 +394,7 @@ Group *rna_Main_groups_new(Main *bmain, const char *name) { return add_group(name); } -void rna_Main_groups_remove(Main *bmain, ReportList *reports, Group *group) +void rna_Main_groups_remove(Main *bmain, Group *group) { unlink_group(group); free_libblock(&bmain->group, group); @@ -405,7 +405,7 @@ Text *rna_Main_texts_new(Main *bmain, const char *name) { return add_empty_text(name); } -void rna_Main_texts_remove(Main *bmain, ReportList *reports, Text *text) +void rna_Main_texts_remove(Main *bmain, Text *text) { unlink_text(bmain, text); free_libblock(&bmain->text, text); @@ -1044,7 +1044,6 @@ void RNA_def_main_groups(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_return(func, parm); func= RNA_def_function(srna, "remove", "rna_Main_groups_remove"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Remove a group from the current blendfile."); parm= RNA_def_pointer(func, "group", "Group", "", "Group to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); @@ -1072,7 +1071,6 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_return(func, parm); func= RNA_def_function(srna, "remove", "rna_Main_texts_remove"); - RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Remove a text from the current blendfile."); parm= RNA_def_pointer(func, "text", "Text", "", "Text to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); |