Revision: 20992
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20992
Author: blendix
Date: 2009-06-18 21:59:20 +0200 (Thu, 18 Jun 2009)
Log Message:
-----------
Branch soc-2009-kazanbas
Merge with trunk revision 20991, and update scripts for the changes too.
Reload Scripts and Export OBJ still work for me.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20991
Modified Paths:
--------------
branches/soc-2009-kazanbas/release/io/export_obj.py
branches/soc-2009-kazanbas/release/ui/space_script.py
branches/soc-2009-kazanbas/source/Makefile
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-kazanbas/source/blender/editors/space_script/space_script.c
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_types.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
branches/soc-2009-kazanbas/source/blender/makesrna/intern/SConscript
branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_color.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_group.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_main.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-kazanbas/source/blender/python/CMakeLists.txt
branches/soc-2009-kazanbas/source/blender/python/Makefile
branches/soc-2009-kazanbas/source/blender/python/SConscript
branches/soc-2009-kazanbas/source/blender/python/generic/BGL.h
branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.h
branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
branches/soc-2009-kazanbas/source/blender/python/generic/vector.h
branches/soc-2009-kazanbas/source/blender/python/intern/Makefile
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_compat.h
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.h
branches/soc-2009-kazanbas/source/creator/CMakeLists.txt
branches/soc-2009-kazanbas/source/gameengine/Converter/CMakeLists.txt
branches/soc-2009-kazanbas/source/gameengine/Converter/Makefile
branches/soc-2009-kazanbas/source/gameengine/Expressions/ListValue.cpp
branches/soc-2009-kazanbas/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2009-kazanbas/source/gameengine/Ketsji/Makefile
Added Paths:
-----------
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2009-kazanbas/source/blender/python/generic/Makefile
Removed 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
Modified: branches/soc-2009-kazanbas/release/io/export_obj.py
===================================================================
--- branches/soc-2009-kazanbas/release/io/export_obj.py 2009-06-18 19:51:22 UTC
(rev 20991)
+++ branches/soc-2009-kazanbas/release/io/export_obj.py 2009-06-18 19:59:20 UTC
(rev 20992)
@@ -4,11 +4,8 @@
out = open(filepath, 'w')
# create a temporary mesh
- mesh = bpy.data.add_mesh("tmpmesh")
+ mesh = ob.create_render_mesh(scene)
- # copy data with modifiers applied
- mesh.copy_applied(scene, ob)
-
# for vert in mesh.verts:
# ^ iterating that way doesn't work atm for some reason
@@ -25,7 +22,8 @@
out.write(' {0}'.format(index + 1))
out.write('\n')
- # TODO: delete mesh here
+ # delete mesh gain
+ bpy.data.remove_mesh(mesh)
out.close()
@@ -37,13 +35,13 @@
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
__props__ = [
- bpy.props["StringProperty"](attr="filename", name="filename")
+ bpy.props.StringProperty(attr="filename", name="filename")
]
def debug(self, message):
print("{0}: {1}".format(self.__class__.__name__, message))
- def exec(self, context):
+ def execute(self, context):
self.debug("exec")
self.debug("filename = " + self.filename)
@@ -61,9 +59,13 @@
def invoke(self, context, event):
self.debug("invoke")
- context.add_fileselect(self.__operator__)
+ wm = context.manager
+ wm.add_fileselect(self.__operator__)
return ('RUNNING_MODAL',)
def poll(self, context): # poll isnt working yet
self.debug("poll")
return True
+
+bpy.ops.add(SCRIPT_OT_export_obj)
+
Modified: branches/soc-2009-kazanbas/release/ui/space_script.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/space_script.py 2009-06-18
19:51:22 UTC (rev 20991)
+++ branches/soc-2009-kazanbas/release/ui/space_script.py 2009-06-18
19:59:20 UTC (rev 20992)
@@ -61,8 +61,8 @@
class SCRIPT_OT_reload_scripts(bpy.types.Operator):
__label__ = 'Reload Scripts'
- def exec(self, context):
- print("SCRIPT_OT_reload_scripts: exec")
+ def execute(self, context):
+ print("SCRIPT_OT_reload_scripts: execute")
# add ../io to sys.path
@@ -116,7 +116,7 @@
def invoke(self, context, event):
print("SCRIPT_OT_reload_scripts: invoke")
- return self.exec(context)
+ return self.execute(context)
def poll(self, context):
pass
@@ -129,3 +129,4 @@
bpy.ops.remove(bpy.ops.SCRIPT_OT_reload_scripts)
bpy.ops.add(SCRIPT_OT_reload_scripts)
+
Modified: branches/soc-2009-kazanbas/source/Makefile
===================================================================
--- branches/soc-2009-kazanbas/source/Makefile 2009-06-18 19:51:22 UTC (rev
20991)
+++ branches/soc-2009-kazanbas/source/Makefile 2009-06-18 19:59:20 UTC (rev
20992)
@@ -162,6 +162,7 @@
COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a
COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a
COMLIB += $(NAN_PNG)/lib/libpng.a
+COMLIB += $(OCGDIR)/blender/gen_python/$(DEBUG_DIR)libgen_python.a
ifeq ($(WITH_QUICKTIME), true)
COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
Modified: branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
2009-06-18 19:51:22 UTC (rev 20991)
+++ branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
2009-06-18 19:59:20 UTC (rev 20992)
@@ -2027,39 +2027,3 @@
vc->em= me->edit_mesh;
}
}
-
-/*
- * This version of copy_mesh doesn't allocate a new mesh,
- * instead it copies data between two existing meshes.
- *
- * XXX not used anywhere...
- */
-void copy_mesh_data(Mesh *dest, Mesh *src)
-{
- int totvert, totedge, totface;
- int has_layer;
-
- CustomData_free(&dest->vdata, dest->totvert);
- CustomData_free(&dest->edata, dest->totedge);
- CustomData_free(&dest->fdata, dest->totface);
-
- memset(&dest->vdata, 0, sizeof(dest->vdata));
- memset(&dest->edata, 0, sizeof(dest->edata));
- memset(&dest->fdata, 0, sizeof(dest->fdata));
-
- totvert = dest->totvert = src->totvert;
- totedge = dest->totedge = src->totedge;
- totface = dest->totface = src->totface;
-
- CustomData_copy(&src->vdata, &dest->vdata, CD_MASK_MESH, CD_DUPLICATE,
totvert);
- CustomData_copy(&src->edata, &dest->edata, CD_MASK_MESH, CD_DUPLICATE,
totedge);
- CustomData_copy(&src->fdata, &dest->fdata, CD_MASK_MESH, CD_DUPLICATE,
totface);
-
- CustomData_has_layer(&dest->vdata, CD_MVERT);
-
- CustomData_add_layer(&dest->vdata, CD_MVERT, CD_ASSIGN, src->mvert,
totvert);
- CustomData_add_layer(&dest->edata, CD_MEDGE, CD_ASSIGN, src->medge,
totedge);
- CustomData_add_layer(&dest->fdata, CD_MFACE, CD_ASSIGN, src->mface,
totface);
-
- mesh_update_customdata_pointers(dest);
-}
Modified:
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
===================================================================
---
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
2009-06-18 19:51:22 UTC (rev 20991)
+++
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
2009-06-18 19:59:20 UTC (rev 20992)
@@ -574,8 +574,14 @@
return 1;
}
else if(CTX_data_equals(member, "cloth")) {
- set_pointer_type(path, result, &RNA_ClothModifier);
- return 1;
+ PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
+
+ if(ptr && ptr->data) {
+ Object *ob= ptr->data;
+ ModifierData *md= modifiers_findByType(ob,
eModifierType_Cloth);
+ CTX_data_pointer_set(result, &ob->id,
&RNA_ClothModifier, md);
+ return 1;
+ }
}
else if(CTX_data_equals(member, "soft_body")) {
PointerRNA *ptr= get_pointer_type(path, &RNA_Object);
Modified:
branches/soc-2009-kazanbas/source/blender/editors/space_script/space_script.c
===================================================================
---
branches/soc-2009-kazanbas/source/blender/editors/space_script/space_script.c
2009-06-18 19:51:22 UTC (rev 20991)
+++
branches/soc-2009-kazanbas/source/blender/editors/space_script/space_script.c
2009-06-18 19:59:20 UTC (rev 20992)
@@ -175,31 +175,11 @@
/* add handlers, stuff you only do once or on area/region changes */
static void script_header_area_init(wmWindowManager *wm, ARegion *ar)
{
- /* UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx,
ar->winy); */
ED_region_header_init(ar);
}
static void script_header_area_draw(const bContext *C, ARegion *ar)
{
- /* float col[3]; */
-
- /* /\* clear *\/ */
- /* if(ED_screen_area_active(C)) */
- /* UI_GetThemeColor3fv(TH_HEADER, col); */
- /* else */
- /* UI_GetThemeColor3fv(TH_HEADERDESEL, col); */
-
- /* glClearColor(col[0], col[1], col[2], 0.0); */
- /* glClear(GL_COLOR_BUFFER_BIT); */
-
- /* /\* set view2d view matrix for scrolling (without scrollers) *\/ */
- /* UI_view2d_view_ortho(C, &ar->v2d); */
-
- /* script_header_buttons(C, ar); */
-
- /* /\* restore view matrix? *\/ */
- /* UI_view2d_view_restore(C); */
-
ED_region_header(C, ar);
}
Modified: branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
2009-06-18 19:51:22 UTC (rev 20991)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
2009-06-18 19:59:20 UTC (rev 20992)
@@ -37,6 +37,7 @@
struct bContext;
struct ID;
struct Main;
+struct ReportList;
/* Types */
@@ -719,13 +720,13 @@
void RNA_parameter_set(ParameterList *parms, PropertyRNA *parm, void *value);
void RNA_parameter_set_lookup(ParameterList *parms, const char *identifier,
void *value);
-int RNA_function_call(PointerRNA *ptr, FunctionRNA *func, ParameterList
*parms);
-int RNA_function_call_lookup(PointerRNA *ptr, const char *identifier,
ParameterList *parms);
+int RNA_function_call(struct bContext *C, struct ReportList *reports,
PointerRNA *ptr, FunctionRNA *func, ParameterList *parms);
+int RNA_function_call_lookup(struct bContext *C, struct ReportList *reports,
PointerRNA *ptr, const char *identifier, ParameterList *parms);
-int RNA_function_call_direct(PointerRNA *ptr, FunctionRNA *func, const char
*format, ...);
-int RNA_function_call_direct_lookup(PointerRNA *ptr, const char *identifier,
const char *format, ...);
-int RNA_function_call_direct_va(PointerRNA *ptr, FunctionRNA *func, const char
*format, va_list args);
-int RNA_function_call_direct_va_lookup(PointerRNA *ptr, const char
*identifier, const char *format, va_list args);
+int RNA_function_call_direct(struct bContext *C, struct ReportList *reports,
PointerRNA *ptr, FunctionRNA *func, const char *format, ...);
+int RNA_function_call_direct_lookup(struct bContext *C, struct ReportList
*reports, PointerRNA *ptr, const char *identifier, const char *format, ...);
+int RNA_function_call_direct_va(struct bContext *C, struct ReportList
*reports, PointerRNA *ptr, FunctionRNA *func, const char *format, va_list args);
+int RNA_function_call_direct_va_lookup(struct bContext *C, struct ReportList
*reports, PointerRNA *ptr, const char *identifier, const char *format, va_list
args);
/* ID */
Modified: branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
2009-06-18 19:51:22 UTC (rev 20991)
+++ branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
2009-06-18 19:59:20 UTC (rev 20992)
@@ -147,7 +147,7 @@
void RNA_def_property_enum_funcs(PropertyRNA *prop, const char *get, const
char *set, const char *item);
void RNA_def_property_string_funcs(PropertyRNA *prop, const char *get, const
char *length, const char *set);
void RNA_def_property_pointer_funcs(PropertyRNA *prop, const char *get, const
char *set, const char *typef);
-void RNA_def_property_collection_funcs(PropertyRNA *prop, const char *begin,
const char *next, const char *end, const char *get, const char *length, const
char *lookupint, const char *lookupstring, const char *add);
+void RNA_def_property_collection_funcs(PropertyRNA *prop, const char *begin,
const char *next, const char *end, const char *get, const char *length, const
char *lookupint, const char *lookupstring, const char *add, const char *remove);
/* Function */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
