[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46401] branches/meshdata_transfer: svn merge ^/trunk/blender -r46330:46335
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue May 8 00:29:00 CEST 2012
Revision: 46401
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46401
Author: cyborgmuppet
Date: 2012-05-07 22:28:59 +0000 (Mon, 07 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46330:46335
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46330
Modified Paths:
--------------
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
branches/meshdata_transfer/source/blender/blenkernel/intern/material.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh_validate.c
branches/meshdata_transfer/source/blender/blenkernel/intern/modifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/meshdata_transfer/source/blender/collada/SkinInfo.cpp
branches/meshdata_transfer/source/blender/editors/armature/armature_intern.h
branches/meshdata_transfer/source/blender/editors/armature/armature_ops.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_data.c
branches/meshdata_transfer/source/blender/editors/object/object_add.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_intern.h
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/object/object_transform.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_hide.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawanimviz.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_curve.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_multires.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_uvproject.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46330
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46335
Modified: branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py 2012-05-07 22:28:59 UTC (rev 46401)
@@ -65,12 +65,10 @@
sub.prop(mpath, "frame_start", text="From")
sub.prop(mpath, "frame_end", text="To")
- sub = col.column() # align=True
- sub.operator_context = 'EXEC_DEFAULT'
if bones:
- col.operator("pose.paths_calculate", text="Update", icon='BONE_DATA')
+ col.operator("pose.paths_update", text="Update Paths", icon='BONE_DATA')
else:
- col.operator("object.paths_calculate", text="Update", icon='OBJECT_DATA')
+ col.operator("object.paths_update", text="Update Paths", icon='OBJECT_DATA')
else:
col.label(text="Not available yet...", icon='ERROR')
col.label(text="Calculate Paths first", icon='INFO')
Modified: branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py 2012-05-07 22:28:59 UTC (rev 46401)
@@ -65,14 +65,10 @@
col.label(text="Protected Layers:")
col.prop(arm, "layers_protected", text="")
- layout.label(text="Deform:")
- flow = layout.column_flow()
- flow.prop(arm, "use_deform_vertex_groups", text="Vertex Groups")
- flow.prop(arm, "use_deform_envelopes", text="Envelopes")
- flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
-
if context.scene.render.engine == 'BLENDER_GAME':
- layout.row().prop(arm, "deform_method", expand=True)
+ col = layout.column()
+ col.label(text="Deform:")
+ col.prop(arm, "deform_method", expand=True)
class DATA_PT_display(ArmatureButtonsPanel, Panel):
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h 2012-05-07 22:28:59 UTC (rev 46401)
@@ -87,8 +87,6 @@
/* data management function pointers - special handling */
/* free any data that is allocated separately (optional) */
void (*free_data)(struct bConstraint *con);
- /* adjust pointer to other ID-data using ID_NEW(), but not to targets (optional) */
- void (*relink_data)(struct bConstraint *con);
/* run the provided callback function on all the ID-blocks linked to the constraint */
void (*id_looper)(struct bConstraint *con, ConstraintIDFunc func, void *userdata);
/* copy any special data that is allocated separately (optional) */
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h 2012-05-07 22:28:59 UTC (rev 46401)
@@ -63,7 +63,7 @@
short BKE_curve_type_get(struct Curve *cu);
void BKE_curve_type_test(struct Object *ob);
void BKE_curve_curve_dimension_update(struct Curve *cu);
-void BKE_curve_tex_space_calc(struct Curve *cu);
+void BKE_curve_texspace_calc(struct Curve *cu);
int BKE_curve_minmax(struct Curve *cu, float min[3], float max[3]);
int BKE_curve_center_median(struct Curve *cu, float cent[3]);
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h 2012-05-07 22:28:59 UTC (rev 46401)
@@ -51,7 +51,7 @@
int BKE_metaball_is_basis(struct Object *ob);
struct Object *BKE_metaball_basis_find(struct Scene *scene, struct Object *ob);
-void BKE_metaball_tex_space_calc(struct Object *ob);
+void BKE_metaball_texspace_calc(struct Object *ob);
float *BKE_metaball_make_orco(struct Object *ob, struct ListBase *dispbase);
void BKE_metaball_properties_copy(struct Scene *scene, struct Object *active_object);
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h 2012-05-07 20:37:48 UTC (rev 46400)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h 2012-05-07 22:28:59 UTC (rev 46401)
@@ -76,109 +76,109 @@
* if both of the above are 0, it'll use the indices of the mpolys of the MPoly
* data in pdata, and ignore the origindex layer altogether.
*/
-int mesh_recalcTessellation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
- struct MVert *mvert,
- int totface, int totloop, int totpoly,
- const int do_face_normals);
+int BKE_mesh_recalc_tessellation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
+ struct MVert *mvert,
+ int totface, int totloop, int totpoly,
+ const int do_face_normals);
/* for forwards compat only quad->tri polys to mface, skip ngons.
*/
-int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
- struct CustomData *pdata, int totface, int totloop, int totpoly);
+int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
+ struct CustomData *pdata, int totface, int totloop, int totpoly);
/*calculates a face normal.*/
void mesh_calc_poly_normal(struct MPoly *mpoly, struct MLoop *loopstart,
struct MVert *mvarray, float no[3]);
-void mesh_calc_poly_normal_coords(struct MPoly *mpoly, struct MLoop *loopstart,
- const float (*vertex_coords)[3], float no[3]);
+void BKE_mesh_calc_poly_normal_coords(struct MPoly *mpoly, struct MLoop *loopstart,
+ const float (*vertex_coords)[3], float no[3]);
-void mesh_calc_poly_center(struct MPoly *mpoly, struct MLoop *loopstart,
- struct MVert *mvarray, float cent[3]);
+void BKE_mesh_calc_poly_center(struct MPoly *mpoly, struct MLoop *loopstart,
+ struct MVert *mvarray, float cent[3]);
-float mesh_calc_poly_area(struct MPoly *mpoly, struct MLoop *loopstart,
- struct MVert *mvarray, float polynormal[3]);
+float BKE_mesh_calc_poly_area(struct MPoly *mpoly, struct MLoop *loopstart,
+ struct MVert *mvarray, float polynormal[3]);
/* Find the index of the loop in 'poly' which references vertex,
* returns -1 if not found */
int poly_find_loop_from_vert(const struct MPoly *poly,
- const struct MLoop *loopstart,
- unsigned vert);
+ const struct MLoop *loopstart,
+ unsigned vert);
/* Fill 'adj_r' with the loop indices in 'poly' adjacent to the
* vertex. Returns the index of the loop matching vertex, or -1 if the
* vertex is not in 'poly' */
int poly_get_adj_loops_from_vert(unsigned adj_r[3], const struct MPoly *poly,
- const struct MLoop *mloop, unsigned vert);
+ const struct MLoop *mloop, unsigned vert);
/* update the hide flag for edges and polys from the corresponding
* flag in verts */
-void mesh_flush_hidden_from_verts(const struct MVert *mvert,
- const struct MLoop *mloop,
- struct MEdge *medge, int totedge,
- struct MPoly *mpoly, int totpoly);
+void BKE_mesh_flush_hidden_from_verts(const struct MVert *mvert,
+ const struct MLoop *mloop,
+ struct MEdge *medge, int totedge,
+ struct MPoly *mpoly, int totpoly);
-void unlink_mesh(struct Mesh *me);
+void BKE_mesh_unlink(struct Mesh *me);
void BKE_mesh_free(struct Mesh *me, int unlink);
struct Mesh *BKE_mesh_add(const char *name);
struct Mesh *BKE_mesh_copy(struct Mesh *me);
void mesh_update_customdata_pointers(struct Mesh *me, const short do_ensure_tess_cd);
void BKE_mesh_make_local(struct Mesh *me);
-void boundbox_mesh(struct Mesh *me, float *loc, float *size);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list