Revision: 20970
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20970
Author: kazanbas
Date: 2009-06-18 11:50:34 +0200 (Thu, 18 Jun 2009)
Log Message:
-----------
API structuring improvements according to design guidelines by Brecht,
for more info see
http://lists.blender.org/pipermail/bf-taskforce25/2009-June/000954.html.
Created *_api.c files in makesrna/intern. Among these only rna_api.c
is compiled on preprocesssing step. It contains code declaring RNA
struct functions, for example RNA_api_mesh declares all functions on
Mesh. The rest *_api.c files contain functions themselves.
Removed interface_api.c and moved its contents to rna_api.c.
Added remove_mesh function on Main.
Replaced copy and copy_mesh on Mesh with make_rendermesh which currently
does the same as copy_applied did (grasping mesh-related stuff needs
time).
SConscript tweaking so it builds ok.
Modified Paths:
--------------
branches/soc-2009-kazanbas/source/blender/editors/interface/SConscript
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/SConscript
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_main.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
Added Paths:
-----------
branches/soc-2009-kazanbas/source/blender/makesrna/intern/main_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/mesh_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/wm_api.c
Removed Paths:
-------------
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_api.c
Modified: branches/soc-2009-kazanbas/source/blender/editors/interface/SConscript
===================================================================
--- branches/soc-2009-kazanbas/source/blender/editors/interface/SConscript
2009-06-18 07:15:17 UTC (rev 20969)
+++ branches/soc-2009-kazanbas/source/blender/editors/interface/SConscript
2009-06-18 09:50:34 UTC (rev 20970)
@@ -3,8 +3,8 @@
sources = env.Glob('*.c')
-for source in env.Glob('*_api.c'):
- sources.remove(source)
+# for source in env.Glob('*_api.c'):
+# sources.remove(source)
incs = '../include ../../blenlib ../../blenfont ../../blenkernel
../../makesdna ../../imbuf'
incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc'
Deleted:
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_api.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/editors/interface/interface_api.c
2009-06-18 07:15:17 UTC (rev 20969)
+++ branches/soc-2009-kazanbas/source/blender/editors/interface/interface_api.c
2009-06-18 09:50:34 UTC (rev 20970)
@@ -1,240 +0,0 @@
-/**
- * $Id:
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "RNA_define.h"
-#include "RNA_types.h"
-
-#include "UI_interface.h"
-
-static void api_ui_item_common(FunctionRNA *func)
-{
- RNA_def_string(func, "text", "", 0, "", "Override automatic text of the
item.");
- RNA_def_int(func, "icon", 0, 0, INT_MAX, "", "Override automatic icon
of the item.", 0, INT_MAX);
-}
-
-static void api_ui_item_op_common(FunctionRNA *func)
-{
- PropertyRNA *parm;
-
- api_ui_item_common(func);
- parm= RNA_def_string(func, "operator", "", 0, "", "Identifier of the
operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-}
-
-void RNA_api_ui_layout(StructRNA *srna)
-{
- FunctionRNA *func;
- PropertyRNA *parm;
-
- static EnumPropertyItem curve_type_items[] = {
- {0, "NONE", "None", ""},
- {'v', "VECTOR", "Vector", ""},
- {'c', "COLOR", "Color", ""},
- {0, NULL, NULL, NULL}};
-
- /* simple layout specifiers */
- func= RNA_def_function(srna, "row", "uiLayoutRow");
- parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to
put items in.");
- RNA_def_function_return(func, parm);
- RNA_def_boolean(func, "align", 0, "", "Align buttons to each other.");
-
- func= RNA_def_function(srna, "column", "uiLayoutColumn");
- parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to
put items in.");
- RNA_def_function_return(func, parm);
- RNA_def_boolean(func, "align", 0, "", "Align buttons to each other.");
-
- func= RNA_def_function(srna, "column_flow", "uiLayoutColumnFlow");
- parm= RNA_def_int(func, "columns", 0, 0, INT_MAX, "", "Number of
columns, 0 is automatic.", 0, INT_MAX);
- parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to
put items in.");
- RNA_def_function_return(func, parm);
- RNA_def_boolean(func, "align", 0, "", "Align buttons to each other.");
-
- /* box layout */
- func= RNA_def_function(srna, "box", "uiLayoutBox");
- parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to
put items in.");
- RNA_def_function_return(func, parm);
-
- /* split layout */
- func= RNA_def_function(srna, "split", "uiLayoutSplit");
- parm= RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to
put items in.");
- RNA_def_function_return(func, parm);
- RNA_def_float(func, "percentage", 0.5f, 0.0f, 1.0f, "Percentage",
"Percentage of width to split at.", 0.0f, 1.0f);
-
- /* items */
- func= RNA_def_function(srna, "itemR", "uiItemR");
- api_ui_item_common(func);
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to
take property.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in data.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- RNA_def_boolean(func, "expand", 0, "", "Expand button to show more
detail.");
- RNA_def_boolean(func, "slider", 0, "", "Use slider widget for numeric
values.");
- RNA_def_boolean(func, "toggle", 0, "", "Use toggle widget for boolean
values.");
-
- func= RNA_def_function(srna, "items_enumR", "uiItemsEnumR");
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to
take property.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in data.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_menu_enumR", "uiItemMenuEnumR");
- api_ui_item_common(func);
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to
take property.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in data.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- /*func= RNA_def_function(srna, "item_enumR", "uiItemEnumR");
- api_ui_item_common(func);
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to
take property.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in data.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "value", "", 0, "", "Enum property value.");
- RNA_def_property_flag(parm, PROP_REQUIRED);*/
-
- func= RNA_def_function(srna, "itemO", "uiItemO");
- api_ui_item_op_common(func);
-
- func= RNA_def_function(srna, "item_enumO", "uiItemEnumO_string");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "value", "", 0, "", "Enum property value.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "items_enumO", "uiItemsEnumO");
- parm= RNA_def_string(func, "operator", "", 0, "", "Identifier of the
operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_menu_enumO", "uiItemMenuEnumO");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_booleanO", "uiItemBooleanO");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_boolean(func, "value", 0, "", "Value of the property to
call the operator with.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_intO", "uiItemIntO");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_int(func, "value", 0, INT_MIN, INT_MAX, "", "Value of the
property to call the operator with.", INT_MIN, INT_MAX);
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_floatO", "uiItemFloatO");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_float(func, "value", 0, -FLT_MAX, FLT_MAX, "", "Value of
the property to call the operator with.", -FLT_MAX, FLT_MAX);
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "item_stringO", "uiItemStringO");
- api_ui_item_op_common(func);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
property in operator.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "value", "", 0, "", "Value of the property
to call the operator with.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "itemL", "uiItemL");
- api_ui_item_common(func);
-
- func= RNA_def_function(srna, "itemM", "uiItemM");
- parm= RNA_def_pointer(func, "context", "Context", "", "Current
context.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- api_ui_item_common(func);
- parm= RNA_def_string(func, "menu", "", 0, "", "Identifier of the
menu.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "itemS", "uiItemS");
-
- /* context */
- func= RNA_def_function(srna, "set_context_pointer",
"uiLayoutSetContextPointer");
- parm= RNA_def_string(func, "name", "", 0, "Name", "Name of entry in the
context.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Pointer to put in
context.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- /* templates */
- func= RNA_def_function(srna, "template_header", "uiTemplateHeader");
- parm= RNA_def_pointer(func, "context", "Context", "", "Current
context.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
-
- func= RNA_def_function(srna, "template_ID", "uiTemplateID");
- parm= RNA_def_pointer(func, "context", "Context", "", "Current
context.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_pointer(func, "data", "AnyType", "", "Data from which to
take property.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- parm= RNA_def_string(func, "property", "", 0, "", "Identifier of
pointer property in data.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
- RNA_def_string(func, "new", "", 0, "", "Operator identifier to create a
new ID block.");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
