[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34283] trunk/blender: bugfix [#25595] Adding Torus when in edit mode strange behavior.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 12 16:45:00 CET 2011
Revision: 34283
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34283
Author: campbellbarton
Date: 2011-01-12 15:45:00 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
bugfix [#25595] Adding Torus when in edit mode strange behavior.
also added Align View option and made local view cursor work.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/add_object_utils.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/source/blender/editors/mesh/mesh_data.c
Modified: trunk/blender/release/scripts/modules/add_object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/add_object_utils.py 2011-01-12 14:08:11 UTC (rev 34282)
+++ trunk/blender/release/scripts/modules/add_object_utils.py 2011-01-12 15:45:00 UTC (rev 34283)
@@ -23,22 +23,41 @@
def add_object_align_init(context, operator):
+ space_data = context.space_data
+ if space_data.type != 'VIEW_3D':
+ space_data = None
- if operator and operator.properties.is_property_set("location") and operator.properties.is_property_set("rotation"):
+ # location
+ if operator and operator.properties.is_property_set("location"):
location = mathutils.Matrix.Translation(mathutils.Vector(operator.properties.location))
- rotation = mathutils.Euler(operator.properties.rotation).to_matrix().resize4x4()
else:
- # TODO, local view cursor!
- location = mathutils.Matrix.Translation(context.scene.cursor_location)
+ if space_data: # local view cursor is detected below
+ location = mathutils.Matrix.Translation(space_data.cursor_location)
+ else:
+ location = mathutils.Matrix.Translation(context.scene.cursor_location)
- if context.user_preferences.edit.object_align == 'VIEW' and context.space_data.type == 'VIEW_3D':
- rotation = context.space_data.region_3d.view_matrix.rotation_part().invert().resize4x4()
+ if operator:
+ operator.properties.location = location.translation_part()
+
+ # rotation
+ view_align = (context.user_preferences.edit.object_align == 'VIEW')
+ view_align_force = False
+ if operator:
+ if operator.properties.is_property_set("view_align"):
+ view_align = view_align_force = operator.view_align
else:
+ operator.properties.view_align = view_align
+
+ if operator.properties.is_property_set("rotation") and not view_align_force:
+ rotation = mathutils.Euler(operator.properties.rotation).to_matrix().resize4x4()
+ else:
+ if view_align and space_data:
+ rotation = space_data.region_3d.view_matrix.rotation_part().invert().resize4x4()
+ else:
rotation = mathutils.Matrix()
# set the operator properties
if operator:
- operator.properties.location = location.translation_part()
operator.properties.rotation = rotation.to_euler()
return location * rotation
@@ -65,6 +84,7 @@
obj_act = scene.objects.active
if obj_act and obj_act.mode == 'EDIT' and obj_act.type == obj_new.type:
+ bpy.ops.mesh.select_all(action='DESELECT')
bpy.ops.object.mode_set(mode='OBJECT')
obj_act.select = True
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2011-01-12 14:08:11 UTC (rev 34282)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2011-01-12 15:45:00 UTC (rev 34283)
@@ -26,8 +26,8 @@
Vector = mathutils.Vector
Quaternion = mathutils.Quaternion
- PI_2 = pi * 2
- z_axis = (0, 0, 1)
+ PI_2 = pi * 2.0
+ z_axis = 0.0, 0.0, 1.0
verts = []
faces = []
@@ -103,9 +103,12 @@
default=0.5, min=0.01, max=100.0)
# generic transform props
+ view_align = BoolProperty(name="Align to View",
+ default=False)
location = FloatVectorProperty(name="Location")
rotation = FloatVectorProperty(name="Rotation")
+
def execute(self, context):
if self.use_abso == True:
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2011-01-12 14:08:11 UTC (rev 34282)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2011-01-12 15:45:00 UTC (rev 34283)
@@ -593,7 +593,7 @@
*med= *med_orig; /* copy from the original */
} else {
BLI_edgehashIterator_getKey(ehi, (int*)&med->v1, (int*)&med->v2);
- med->flag = ME_EDGEDRAW|ME_EDGERENDER;
+ med->flag = ME_EDGEDRAW|ME_EDGERENDER|SELECT; /* select for newly created meshes which are selected [#25595] */
}
}
BLI_edgehashIterator_free(ehi);
More information about the Bf-blender-cvs
mailing list