Merging r49738 through r49757 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 10 Aug 2012 08:54:14 +0000 (08:54 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 10 Aug 2012 08:54:14 +0000 (08:54 +0000)
1  2 
SConstruct
release/scripts/startup/bl_ui/properties_object_constraint.py
release/scripts/startup/bl_ui/space_image.py
source/blender/makesrna/intern/rna_nodetree.c

diff --cc SConstruct
index 493342c90d3751a22d9768df533e7160c74f36ac,9f8027c17066de755a7492d9300729d9caa291fc..a0fdf4b9fe30a1523e933407000f89c14379a3b5
@@@ -612,32 -656,12 +656,32 @@@ if env['OURPLATFORM']!='darwin'
                      cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
                      scriptinstall.append(env.Install(dir=dir,source=cubin_file))
  
 +    if env['WITH_BF_OCIO']:
 +        colormanagement = os.path.join('release', 'datafiles', 'colormanagement')
 +
 +        for dp, dn, df in os.walk(colormanagement):
 +            if '.svn' in dn:
 +                dn.remove('.svn')
 +            if '_svn' in dn:
 +                dn.remove('_svn')
 +
 +            dir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles')
 +            dir += os.sep + os.path.basename(colormanagement) + dp[len(colormanagement):]
 +
 +            source = [os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
 +
 +            # To ensure empty dirs are created too
 +            if len(source) == 0:
 +                env.Execute(Mkdir(dir))
 +
 +            scriptinstall.append(env.Install(dir=dir,source=source))
 +
      if env['WITH_BF_INTERNATIONAL']:
          internationalpaths=['release' + os.sep + 'datafiles']
-         
          def check_path(path, member):
              return (member in path.split(os.sep))
-         
          for intpath in internationalpaths:
              for dp, dn, df in os.walk(intpath):
                  if '.svn' in dn:
index 3c53a829fa2143587dea190be5d93f6216e6c9ba,3d671a0d1b7e11795b31686ac378358b2ac38950..5057209c97a55c0c8ab12b84d9c85ceacb61e584
@@@ -782,8 -782,13 +782,14 @@@ class ConstraintButtonsPanel()
          row.prop(con, "frame_method", expand=True)
  
          if clip:
 -            tracking = clip.tracking
 +            col.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
-             col.prop_search(con, "track", clip.tracking, "tracks", icon='ANIM_DATA')
 -            col.prop_search(con, "object", tracking, "objects", icon='OBJECT_DATA')
 -
 -            tracking_object = tracking.objects.get(con.object, tracking.objects[0])
++            if con.object in clip.tracking.objects:
++                tracking_object = clip.tracking.objects[con.object]
++            else:
++                tracking_object = clip.tracking
+             col.prop_search(con, "track", tracking_object, "tracks", icon='ANIM_DATA')
  
          col.prop(con, "camera")