NLA SoC: Merge from 2.5
authorJoshua Leung <aligorith@gmail.com>
Sat, 11 Jul 2009 03:23:45 +0000 (03:23 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sat, 11 Jul 2009 03:23:45 +0000 (03:23 +0000)
21470 to 21512

Next up, NLA-branch to 2.5 :)

16 files changed:
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_transform.h
source/blender/editors/interface/view2d.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/intern/bpy_util.c

index adcf2cfc0242fed9e0440a122b7823eb7b82602b,fde270040a9d48be6c4404ca20da919b601d997b..d2185854a95309476709f0f0ad6f8f22c5317d49
@@@ -1,5 -1,5 +1,5 @@@
  /**
-- * $Id$
++ * $Id: ED_transform.h 21450 2009-07-09 02:45:48Z theeth $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 6ed5d6609c435cac753ef2b37c7f7fd3d384f86b,e0e2af5472d5ff5b653196162e3761ca2fa28af0..c3a0b2a2cdd558749e5f4e700cfa801887b96e2e
@@@ -263,14 -247,18 +264,18 @@@ void UI_view2d_region_reinit(View2D *v2
                                
                                v2d->tot.xmin= 0.0f;
                                v2d->tot.xmax= winx;
 -
 +                              
                                v2d->tot.ymax= 0.0f;
                                v2d->tot.ymin= -winy;
 -
 +                              
-                               v2d->cur= v2d->tot;
+                               v2d->cur.xmin= 0.0f;
+                               v2d->cur.xmax= winx*style->panelzoom;
+                               v2d->cur.ymax= 0.0f;
+                               v2d->cur.ymin= -winy*style->panelzoom;
                        }
                                break;
 -
 +                              
                                /* other view types are completely defined using their own settings already */
                        default:
                                /* we don't do anything here, as settings should be fine, but just make sure that rect */
Simple merge