NLA SoC: Merge from 2.5
authorJoshua Leung <aligorith@gmail.com>
Fri, 10 Jul 2009 01:57:55 +0000 (01:57 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 10 Jul 2009 01:57:55 +0000 (01:57 +0000)
21330 to 21469

27 files changed:
1  2 
release/ui/buttons_data_modifier.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_screen.h
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/view2d.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.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/generic/quat.c

Simple merge
index 956c8e0042e910836614952699ccfe228445c124,c36a287b9811d6dc970e35a825a6fb3a7db2128d..c475ed5a949936873c48f2376d35c19a643bac99
@@@ -9238,17 -9146,12 +9230,19 @@@ static void do_versions(FileData *fd, L
  
                for(sce = main->scene.first; sce; sce = sce->id.next) {
                        ts= sce->toolsettings;
-                       if(ts->normalsize == 0.0) {
+                       if(ts->normalsize == 0.0 || !ts->uv_selectmode || ts->vgroup_weight == 0.0) {
                                ts->normalsize= 0.1f;
                                ts->selectmode= SCE_SELECT_VERTEX;
 +                              
 +                              /* autokeying - setting should be taken from the user-prefs
 +                               * but the userprefs version may not have correct flags set 
 +                               * (i.e. will result in blank box when enabled)
 +                               */
                                ts->autokey_mode= U.autokey_mode;
 +                              if (ts->autokey_mode == 0) 
 +                                      ts->autokey_mode= 2; /* 'add/replace' but not on */
+                               ts->uv_selectmode= UV_SELECT_VERTEX;
+                               ts->vgroup_weight= 1.0f;
                        }
                }
        }
index 28b6f0b4ab6729c3a932d5ca11fd0adb47ae648f,71f2eb2a8dee20743b9c1078747c1f1691baf540..86970f3565ce6eeda8a1d8b35591e877bf1f1fdf
  #include "BKE_report.h"
  #include "BKE_utildefines.h"
  
 +#include "UI_interface.h"
  #include "UI_view2d.h"
  
- #include "BIF_transform.h"
  #include "ED_anim_api.h"
  #include "ED_keyframing.h"
  #include "ED_keyframes_draw.h"
index 0d19eeb913ee25e534b5dd9602183a937e88ab6a,6d2337bbc8c4ecc6403d745298f7935f69f802d1..47f9159d87f78fa122da7017d7e04860e1952f75
  #include "ED_keyframing.h"
  #include "ED_keyframes_edit.h"
  #include "ED_object.h"
 +#include "ED_markers.h"
  #include "ED_mesh.h"
+ #include "ED_retopo.h"
  #include "ED_types.h"
  #include "ED_uvedit.h"
  #include "ED_view3d.h"
@@@ -2990,9 -2805,10 +2994,10 @@@ static int count_gplayer_frames(bGPDlay
        
        return count;
  }
+ #endif
  
  /* This function assigns the information to transdata */
 -static void TimeToTransData(TransData *td, float *time, Object *ob)
 +static void TimeToTransData(TransData *td, float *time, AnimData *adt)
  {
        /* memory is calloc'ed, so that should zero everything nicely for us */
        td->val = time;
index 9d111f39b6d4dfac0632ff87fa35518725632b5f,5bb1a2e13291912cd8320a85bb7d4c511710f725..3415c266cf1b13f5380384b8b57c2384bc920f16
@@@ -89,8 -89,8 +88,9 @@@
  #include "ED_armature.h"
  #include "ED_image.h"
  #include "ED_keyframing.h"
 +#include "ED_markers.h"
  #include "ED_mesh.h"
+ #include "ED_retopo.h"
  #include "ED_space_api.h"
  #include "ED_uvedit.h"
  #include "ED_view3d.h"
index ecb588311183ed312baa10d21260247cd8a64b3d,97fb3531718c9bad8e5c9009dd5b84ef9da03485..d77f38967b01cf16e7c560d6c9ff9be9af42c115
@@@ -602,32 -627,19 +627,32 @@@ void transform_keymap_for_space(struct 
                                // XXX the 'mode' identifier here is not quite right
                        km= WM_keymap_add_item(keymap, "TFM_OT_transform", EKEY, KM_PRESS, 0, 0);
                        RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
-                       
                        km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
-                       
                        km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
                        break;
 +              case SPACE_NLA:
 +                      km= WM_keymap_add_item(keymap, "TFM_OT_transform", GKEY, KM_PRESS, 0, 0);
 +                      RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
 +                      
 +                      km= WM_keymap_add_item(keymap, "TFM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
 +                      RNA_int_set(km->ptr, "mode", TFM_TRANSLATION);
 +                      
 +                      km= WM_keymap_add_item(keymap, "TFM_OT_transform", EKEY, KM_PRESS, 0, 0);
 +                      RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
 +                      
 +                      km= WM_keymap_add_item(keymap, "TFM_OT_transform", SKEY, KM_PRESS, 0, 0);
 +                      RNA_int_set(km->ptr, "mode", TFM_TIME_SCALE);
 +                      break;
                case SPACE_NODE:
                        km= WM_keymap_add_item(keymap, "TFM_OT_translation", GKEY, KM_PRESS, 0, 0);
-                       
                        km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_A, KM_ANY, 0, 0);
                        km= WM_keymap_add_item(keymap, "TFM_OT_translation", EVT_TWEAK_S, KM_ANY, 0, 0);
-                       
                        km = WM_keymap_add_item(keymap, "TFM_OT_rotation", RKEY, KM_PRESS, 0, 0);
-                       
                        km = WM_keymap_add_item(keymap, "TFM_OT_resize", SKEY, KM_PRESS, 0, 0);
                        break;
                case SPACE_SEQ:
Simple merge