Merging r38562 through r38614 from trunkinto soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jul 2011 16:58:22 +0000 (16:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jul 2011 16:58:22 +0000 (16:58 +0000)
1  2 
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
  #include "ED_object.h"
  #include "ED_markers.h"
  #include "ED_mesh.h"
+ #include "ED_node.h"
  #include "ED_types.h"
  #include "ED_uvedit.h"
 +#include "ED_clip.h"
  #include "ED_curve.h" /* for ED_curve_editnurbs */
  #include "ED_util.h"  /* for crazyspace correction */
  
@@@ -4760,11 -4763,13 +4767,16 @@@ void special_aftertrans_update(bContex
  
        }
        else if (t->spacetype == SPACE_NODE) {
-               /* pass */
+               if(cancelled == 0)
+                       ED_node_link_insert(t->sa);
+               
+               /* clear link line */
+               ED_node_link_intersect_test(t->sa, 0);
+               
        }
 +      else if (t->spacetype == SPACE_CLIP) {
 +              /* pass */
 +      }
        else if (t->spacetype == SPACE_ACTION) {
                SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
                bAnimContext ac;