Revision: 48335
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48335
Author: campbellbarton
Date: 2012-06-27 14:36:06 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48321:48333
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48321
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/python/bmesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48321
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48333
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
2012-06-27 14:36:06 UTC (rev 48335)
@@ -64,7 +64,7 @@
if (static_path) {
static char system_path[PATH_MAX];
snprintf(system_path, sizeof(system_path), "%s/blender/%s",
static_path, versionstr);
- return (GHOST_TUns8*)system_path;
+ return (GHOST_TUns8 *)system_path;
}
return NULL;
@@ -81,22 +81,22 @@
if (home) {
snprintf(user_path, sizeof(user_path),
"%s/.blender/%s", home, versionstr);
- return (GHOST_TUns8*)user_path;
+ return (GHOST_TUns8 *)user_path;
}
return NULL;
}
else {
- const char *home= getenv("XDG_CONFIG_HOME");
+ const char *home = getenv("XDG_CONFIG_HOME");
if (home) {
snprintf(user_path, sizeof(user_path), "%s/blender/%s",
home, versionstr);
}
else {
- home= getenv("HOME");
+ home = getenv("HOME");
if (home == NULL)
- home= getpwuid(getuid())->pw_dir;
+ home = getpwuid(getuid())->pw_dir;
snprintf(user_path, sizeof(user_path),
"%s/.config/blender/%s", home, versionstr);
}
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
2012-06-27 14:36:06 UTC (rev 48335)
@@ -245,12 +245,12 @@
* Finds groups of vertices closer then dist and merges them together,
* using the weld verts bmop.
*/
-static BMOpDefine bmo_removedoubles_def = {
- "removedoubles",
+static BMOpDefine bmo_remove_doubles_def = {
+ "remove_doubles",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input verts
{BMO_OP_SLOT_FLT, "dist"}, //minimum distance
{0, /* null-terminating sentinel */}},
- bmo_removedoubles_exec,
+ bmo_remove_doubles_exec,
BMO_OP_FLAG_UNTAN_MULTIRES,
};
@@ -1199,7 +1199,7 @@
&bmo_contextual_create_def,
&bmo_makevert_def,
&bmo_weldverts_def,
- &bmo_removedoubles_def,
+ &bmo_remove_doubles_def,
&bmo_finddoubles_def,
&bmo_mirror_def,
&bmo_edgebisect_def,
Modified:
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
===================================================================
---
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
2012-06-27 14:35:56 UTC (rev 48334)
+++
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
2012-06-27 14:36:06 UTC (rev 48335)
@@ -57,7 +57,7 @@
void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op);
void bmo_dissolve_edgeloop_exec(BMesh *bm, BMOperator *op);
void bmo_weldverts_exec(BMesh *bm, BMOperator *op);
-void bmo_removedoubles_exec(BMesh *bm, BMOperator *op);
+void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op);
void bmo_finddoubles_exec(BMesh *bm, BMOperator *op);
void bmo_mirror_exec(BMesh *bm, BMOperator *op);
void bmo_edgebisect_exec(BMesh *bm, BMOperator *op);
Modified:
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
2012-06-27 14:36:06 UTC (rev 48335)
@@ -365,7 +365,7 @@
len2 = len_v3v3(vec, vec2);
/* use shortest segment length divided by 3 as merge threshold
*/
- BMO_op_callf(bm, "removedoubles verts=%fv dist=%f", VERT_MARK,
MIN2(len, len2) / 3.0f);
+ BMO_op_callf(bm, "remove_doubles verts=%fv dist=%f", VERT_MARK,
MIN2(len, len2) / 3.0f);
}
/* and now do imat */
@@ -661,7 +661,7 @@
BM_face_create_quad_tri(bm, v1, v2, firstv2, firstv1, NULL, FALSE);
- BMO_op_callf(bm, "removedoubles verts=%fv dist=%f", VERT_MARK,
0.000001);
+ BMO_op_callf(bm, "remove_doubles verts=%fv dist=%f", VERT_MARK,
0.000001);
BMO_slot_buffer_from_enabled_flag(bm, op, "vertout", BM_VERT,
VERT_MARK);
}
Modified:
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
2012-06-27 14:36:06 UTC (rev 48335)
@@ -557,7 +557,7 @@
BLI_array_free(verts);
}
-void bmo_removedoubles_exec(BMesh *bm, BMOperator *op)
+void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op)
{
BMOperator weldop;
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48321
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48333
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
2012-06-27 14:36:06 UTC (rev 48335)
@@ -898,7 +898,7 @@
return 0;
}
-static int mesh_get_x_mirror_vert_spacial(Object *ob, int index)
+static int mesh_get_x_mirror_vert_spatial(Object *ob, int index)
{
Mesh *me = ob->data;
MVert *mvert;
@@ -926,12 +926,12 @@
return mesh_get_x_mirror_vert_topo(ob, index);
}
else {
- return mesh_get_x_mirror_vert_spacial(ob, index);
+ return mesh_get_x_mirror_vert_spatial(ob, index);
}
return 0;
}
-static BMVert *editbmesh_get_x_mirror_vert_spacial(Object *ob, BMEditMesh *em,
const float co[3])
+static BMVert *editbmesh_get_x_mirror_vert_spatial(Object *ob, BMEditMesh *em,
const float co[3])
{
float vec[3];
intptr_t poinval;
@@ -989,7 +989,7 @@
return editbmesh_get_x_mirror_vert_topo(ob, em, eve, index);
}
else {
- return editbmesh_get_x_mirror_vert_spacial(ob, em, co);
+ return editbmesh_get_x_mirror_vert_spatial(ob, em, co);
}
}
Modified:
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
2012-06-27 14:35:56 UTC (rev 48334)
+++ branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
2012-06-27 14:36:06 UTC (rev 48335)
@@ -4935,7 +4935,7 @@
if (BKE_brush_size_get(scene, brush) < 2)
BKE_brush_size_set(scene, brush, 2);
- /* allocate and initialize spacial data structures */
+ /* allocate and initialize spatial data structures */
project_paint_begin(&pop->ps);
if (pop->ps.dm == NULL)
@@ -5728,7 +5728,7 @@
undo_paint_push_begin(UNDO_PAINT_IMAGE, op->type->name,
image_undo_restore, image_undo_free);
- /* allocate and initialize spacial data structures */
+ /* allocate and initialize spatial data structures */
project_paint_begin(&ps);
if (ps.dm == NULL) {
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48321
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48333
Modified:
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
2012-06-27 14:35:56 UTC (rev 48334)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
