Revision: 39890
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39890
Author: campbellbarton
Date: 2011-09-03 12:39:17 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
svn merge -r39877:39878
https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39877
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/modules/bpy_types.py
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39877
+ /trunk/blender:31524-39878
Modified: branches/bmesh/blender/release/scripts/modules/bpy_types.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_types.py 2011-09-03
10:49:54 UTC (rev 39889)
+++ branches/bmesh/blender/release/scripts/modules/bpy_types.py 2011-09-03
12:39:17 UTC (rev 39890)
@@ -183,7 +183,7 @@
@property
def center(self):
"""The midpoint between the head and the tail."""
- return (self.head + self.tail) * 0.5
+ return self.head.lerp(self.tail, 0.5)
@property
def length(self):
@@ -568,7 +568,7 @@
draw_funcs = cls._dyn_ui_initialize()
try:
draw_funcs.remove(draw_func)
- except:
+ except ValueError:
pass
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39877
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39877
+
/trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39878
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39877
+ /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39878
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-09-03 10:49:54 UTC (rev 39889)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-09-03 12:39:17 UTC (rev 39890)
@@ -620,7 +620,7 @@
int i,j;
for (ob=G.main->object.first; ob; ob=ob->id.next) {
- if (ob->parent==ob && ELEM(ob->partype,
PARVERT1,PARVERT3)) {
+ if (ob->parent==bm->ob && ELEM(ob->partype,
PARVERT1,PARVERT3)) {
/* duplicate code from below, make it function
later...? */
if (!vertMap) {
Modified: branches/bmesh/blender/source/blender/editors/object/object_hook.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_hook.c
2011-09-03 10:49:54 UTC (rev 39889)
+++ branches/bmesh/blender/source/blender/editors/object/object_hook.c
2011-09-03 12:39:17 UTC (rev 39890)
@@ -65,6 +65,7 @@
#include "ED_curve.h"
#include "ED_mesh.h"
+#include "ED_lattice.h"
#include "ED_screen.h"
#include "WM_types.h"
@@ -297,7 +298,7 @@
return totvert;
}
-static int object_hook_index_array(Object *obedit, int *tot, int **indexar,
char *name, float *cent_r)
+static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int
**indexar, char *name, float *cent_r)
{
*indexar= NULL;
*tot= 0;
@@ -307,7 +308,10 @@
case OB_MESH:
{
Mesh *me= obedit->data;
- BMEditMesh *em = me->edit_btmesh;
+ BMEditMesh *em;
+ EDBM_LoadEditBMesh(scene, obedit);
+ EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit);
+ em = me->edit_btmesh;
/* check selected vertices first */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
