Revision: 24915
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24915
Author: aligorith
Date: 2009-11-26 11:19:09 +0100 (Thu, 26 Nov 2009)
Log Message:
-----------
Bugfix #20069: Centre to cursor or centre to mouse, centre object.
- Was missing notifier after editing
- Menu entries go bad naming after the UI api renaming
Modified Paths:
--------------
trunk/blender/release/scripts/io/import_anim_bvh.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_transform.c
Modified: trunk/blender/release/scripts/io/import_anim_bvh.py
===================================================================
--- trunk/blender/release/scripts/io/import_anim_bvh.py 2009-11-26 09:48:53 UTC
(rev 24914)
+++ trunk/blender/release/scripts/io/import_anim_bvh.py 2009-11-26 10:19:09 UTC
(rev 24915)
@@ -227,8 +227,6 @@
if ROT_STYLE != 'NATIVE':
rx, ry, rz = eulerRotate(rx, ry, rz,
bvh_node.rot_order)
- #x,y,z = x/10.0, y/10.0, z/10.0 # For IPO's 36
is 360d
-
# Make interpolation not cross between 180d,
thjis fixes sub frame interpolation and time scaling.
# Will go from (355d to 365d) rather then to
(355d to 5d) - inbetween these 2 there will now be a correct interpolation.
@@ -337,7 +335,7 @@
bvh_node.temp.rot= rx*DEG2RAD,ry*DEG2RAD,rz*DEG2RAD
-
bvh_node.temp.insertIpoKey(Blender.Object.IpoKeyTypes.LOCROT)
+
bvh_node.temp.insertIpoKey(Blender.Object.IpoKeyTypes.LOCROT) # XXX invalid
scn.update(1)
return objects
@@ -540,6 +538,7 @@
'''
# KEYFRAME METHOD, SLOW, USE IPOS DIRECT
+ # TODO: use f-point samples instead (Aligorith)
# Animate the data, the last used bvh_node will do since they all have
the same number of frames
for current_frame in range(len(bvh_node.anim_data)-1): # skip the first
frame (rest frame)
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2009-11-26 09:48:53 UTC
(rev 24914)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2009-11-26 10:19:09 UTC
(rev 24915)
@@ -102,9 +102,9 @@
layout.operator_context = 'EXEC_AREA'
- layout.operator("object.center_set").type = 'CENTER'
- layout.operator("object.center_set").type = 'CENTER_NEW'
- layout.operator("object.center_set").type = 'CENTER_CURSOR'
+ layout.operator("object.center_set", text="ObData to Center").type =
'CENTER'
+ layout.operator("object.center_set", text="Center New").type =
'CENTER_NEW'
+ layout.operator("object.center_set", text="Center Cursor").type =
'CENTER_CURSOR'
class VIEW3D_MT_mirror(bpy.types.Menu):
bl_label = "Mirror"
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2009-11-26
09:48:53 UTC (rev 24914)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2009-11-26
10:19:09 UTC (rev 24915)
@@ -1733,85 +1733,6 @@
}
-void set_ob_ipoflags(Scene *scene, View3D *v3d)
-{
-#if 0 // XXX old animation system
- Base *base;
- int set= 1;
-
- if (!v3d) {
- error("Can't do this! Open a 3D window");
- return;
- }
-
- for(base= FIRSTBASE; base; base= base->next) {
- if(TESTBASELIB(v3d, base)) {
- if(base->object->ipoflag & OB_DRAWKEY) {
- set= 0;
- break;
- }
- }
- }
-
- for(base= FIRSTBASE; base; base= base->next) {
- if(TESTBASELIB(v3d, base)) {
- if(set) {
- base->object->ipoflag |= OB_DRAWKEY;
- if(base->object->ipo)
base->object->ipo->showkey= 1;
- }
- else {
- base->object->ipoflag &= ~OB_DRAWKEY;
- if(base->object->ipo)
base->object->ipo->showkey= 0;
- }
- }
- }
-#endif // XXX old animation system
-}
-
-
-void select_select_keys(Scene *scene, View3D *v3d)
-{
-#if 0 // XXX old animation system
- Base *base;
- IpoCurve *icu;
- BezTriple *bezt;
- int a;
-
- if (!v3d) {
- error("Can't do this! Open a 3D window");
- return;
- }
-
- if(scene->id.lib) return;
-
- if(okee("Show and select all keys")==0) return;
-
- for(base= FIRSTBASE; base; base= base->next) {
- if(TESTBASELIB(v3d, base)) {
- if(base->object->ipo) {
- base->object->ipoflag |= OB_DRAWKEY;
- base->object->ipo->showkey= 1;
- icu= base->object->ipo->curve.first;
- while(icu) {
- a= icu->totvert;
- bezt= icu->bezt;
- while(a--) {
- bezt->f1 |= SELECT;
- bezt->f2 |= SELECT;
- bezt->f3 |= SELECT;
- bezt++;
- }
- icu= icu->next;
- }
- }
- }
- }
-
-
-#endif // XXX old animation system
-}
-
-
int vergbaseco(const void *a1, const void *a2)
{
Base **x1, **x2;
Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c
2009-11-26 09:48:53 UTC (rev 24914)
+++ trunk/blender/source/blender/editors/object/object_transform.c
2009-11-26 10:19:09 UTC (rev 24915)
@@ -1011,6 +1011,7 @@
if (tot_change) {
DAG_ids_flush_update(0);
+ WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
}
/* Warn if any errors occured */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
