Merging r37479 through r37513 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Jun 2011 17:21:34 +0000 (17:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Jun 2011 17:21:34 +0000 (17:21 +0000)
1  2 
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c

diff --cc CMakeLists.txt
Simple merge
index 0345c8834a6784537524bc998d7854de4b4b7fb4,20a26d8c58d43973333bfe9495cd04ab1f718575..b9afa00cb755e5e44a0a23706ff95db4ed55d032
@@@ -843,36 -840,7 +843,33 @@@ void recalcData(TransInfo *t
                                DAG_id_tag_update(&ob->id, OB_RECALC_OB);
                        }
                }
-               
-               if(((View3D*)t->view)->drawtype == OB_SHADED)
-                       reshadeall_displist(t->scene);
        }
 +      else if (t->spacetype == SPACE_CLIP) {
 +              SpaceClip *sc= t->sa->spacedata.first;
 +              MovieClip *clip= ED_space_clip(sc);
 +              MovieTrackingTrack *track;
 +              flushTransTracking(t);
 +
 +              track= clip->tracking.tracks.first;
 +              while(track) {
 +                      if(TRACK_SELECTED(track)) {
 +                              if (t->mode == TFM_TRANSLATION) {
 +                                      if(TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
 +                                              BKE_tracking_clamp_track(track, CLAMP_PAT_POS);
 +                                      if(TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
 +                                              BKE_tracking_clamp_track(track, CLAMP_SEARCH_POS);
 +                              }
 +                              else if (t->mode == TFM_RESIZE) {
 +                                      if(TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
 +                                              BKE_tracking_clamp_track(track, CLAMP_PAT_DIM);
 +                                      if(TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
 +                                              BKE_tracking_clamp_track(track, CLAMP_SEARCH_DIM);
 +                              }
 +                      }
 +
 +                      track= track->next;
 +              }
 +      }
  }
  
  void drawLine(TransInfo *t, float *center, float *dir, char axis, short options)