Revision: 28046
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28046
Author: blendix
Date: 2010-04-06 12:13:19 +0200 (Tue, 06 Apr 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28042:28045
Modified Paths:
--------------
branches/render25/release/scripts/op/nla.py
branches/render25/source/blender/blenkernel/BKE_screen.h
branches/render25/source/blender/blenkernel/intern/screen.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/screen_ops.c
Modified: branches/render25/release/scripts/op/nla.py
===================================================================
--- branches/render25/release/scripts/op/nla.py 2010-04-06 10:07:24 UTC (rev
28045)
+++ branches/render25/release/scripts/op/nla.py 2010-04-06 10:13:19 UTC (rev
28046)
@@ -110,18 +110,18 @@
#pbone.rotation_quaternion = matrix.to_quat()
pbone.matrix_local = [f for v in matrix for f in v]
- pbone.keyframe_insert("location", -1, f, "Location")
+ pbone.keyframe_insert("location", -1, f, name)
rotation_mode = pbone.rotation_mode
if rotation_mode == 'QUATERNION':
- pbone.keyframe_insert("rotation_quaternion", -1, f, "Rotation")
+ pbone.keyframe_insert("rotation_quaternion", -1, f, name)
elif rotation_mode == 'AXIS_ANGLE':
- pbone.keyframe_insert("rotation_axis_angle", -1, f, "Rotation")
+ pbone.keyframe_insert("rotation_axis_angle", -1, f, name)
else: # euler, XYZ, ZXY etc
- pbone.keyframe_insert("rotation_euler", -1, f, "Rotation")
+ pbone.keyframe_insert("rotation_euler", -1, f, name)
- pbone.keyframe_insert("scale", -1, f, "Scale")
+ pbone.keyframe_insert("scale", -1, f, name)
return action
Modified: branches/render25/source/blender/blenkernel/BKE_screen.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_screen.h 2010-04-06
10:07:24 UTC (rev 28045)
+++ branches/render25/source/blender/blenkernel/BKE_screen.h 2010-04-06
10:13:19 UTC (rev 28046)
@@ -227,7 +227,6 @@
/* spacedata */
void BKE_spacedata_freelist(ListBase *lb);
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
-void BKE_spacedata_copyfirst(ListBase *lb1, ListBase *lb2);
/* area/regions */
struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
Modified: branches/render25/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/screen.c 2010-04-06
10:07:24 UTC (rev 28045)
+++ branches/render25/source/blender/blenkernel/intern/screen.c 2010-04-06
10:13:19 UTC (rev 28046)
@@ -235,27 +235,6 @@
}
}
-/* lb1 should be empty */
-void BKE_spacedata_copyfirst(ListBase *lb1, ListBase *lb2)
-{
- SpaceLink *sl;
-
- lb1->first= lb1->last= NULL; /* to be sure */
-
- sl= lb2->first;
- if(sl) {
- SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
-
- if(st && st->duplicate) {
- SpaceLink *slnew= st->duplicate(sl);
-
- BLI_addtail(lb1, slnew);
-
- region_copylist(st, &slnew->regionbase,
&sl->regionbase);
- }
- }
-}
-
/* not region itself */
void BKE_area_region_free(SpaceType *st, ARegion *ar)
{
Modified: branches/render25/source/blender/editors/screen/area.c
===================================================================
--- branches/render25/source/blender/editors/screen/area.c 2010-04-06
10:07:24 UTC (rev 28045)
+++ branches/render25/source/blender/editors/screen/area.c 2010-04-06
10:13:19 UTC (rev 28046)
@@ -954,6 +954,7 @@
{
SpaceType *st;
ARegion *ar;
+ int spacetype= sa1->spacetype;
sa1->headertype= sa2->headertype;
sa1->spacetype= sa2->spacetype;
@@ -981,7 +982,7 @@
}
else {
if(swap_space<2) {
- st= BKE_spacetype_from_id(sa1->spacetype);
+ st= BKE_spacetype_from_id(spacetype);
for(ar= sa1->regionbase.first; ar; ar= ar->next)
BKE_area_region_free(st, ar);
BLI_freelistN(&sa1->regionbase);
@@ -1004,10 +1005,6 @@
ED_area_exit(C, sa1);
ED_area_exit(C, sa2);
- tmp->spacetype= sa1->spacetype;
- tmp->butspacetype= sa1->butspacetype;
- BKE_spacedata_copyfirst(&tmp->spacedata, &sa1->spacedata);
-
area_copy_data(tmp, sa1, 2);
area_copy_data(sa1, sa2, 0);
area_copy_data(sa2, tmp, 0);
Modified: branches/render25/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/render25/source/blender/editors/screen/screen_ops.c
2010-04-06 10:07:24 UTC (rev 28045)
+++ branches/render25/source/blender/editors/screen/screen_ops.c
2010-04-06 10:13:19 UTC (rev 28046)
@@ -614,15 +614,16 @@
return area_swap_cancel(C, op);
}
- ED_area_swapspace(C, sad->sa1, sad->sa2);
-
- area_swap_exit(C, op);
-
+
#ifdef WM_FAST_DRAW
ED_area_tag_redraw(sad->sa1);
ED_area_tag_redraw(sad->sa2);
#endif
+ ED_area_swapspace(C, sad->sa1, sad->sa2);
+
+ area_swap_exit(C, op);
+
WM_event_add_notifier(C, NC_SCREEN|NA_EDITED,
NULL);
return OPERATOR_FINISHED;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
