svn merge ^/trunk/blender -r48415:48469
authorCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2012 15:39:02 +0000 (15:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2012 15:39:02 +0000 (15:39 +0000)
1  2 
CMakeLists.txt
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/btools.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_node/space_node.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/allocimbuf.c
source/blender/nodes/CMakeLists.txt
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
index 72a5ebcfb1cec52353940679d3023fa315c41aff,9e1ef4f5d4ba1d70d55bf8718bc6b24a598c38c3..fb2afb723e6a91c17ea1fde4d14a5cc37c82920e
@@@ -130,7 -130,7 +130,8 @@@ option(WITH_FFTW3         "Enable FFTW
  option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
  option(WITH_GAMEENGINE    "Enable Game Engine" ON)
  option(WITH_PLAYER        "Build Player" OFF)
 +option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
+ option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
  
  # GHOST Windowing Library Options
  option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
Simple merge
index 09f7ca95124e4ba0443469beef84c913ce2fa809,3a834ef633153c14ed317c9b7e304ac0e70ba209..6982c96391eb0356ee45c821dcbdc149f90b3807
@@@ -105,29 -104,27 +105,29 @@@ static SpaceLink *node_new(const bConte
        /* backdrop */
        snode->zoom = 1.0f;
  
 +      BKE_color_managed_view_settings_init(&snode->view_settings);
 +
        /* header */
-       ar= MEM_callocN(sizeof(ARegion), "header for node");
-       
+       ar = MEM_callocN(sizeof(ARegion), "header for node");
        BLI_addtail(&snode->regionbase, ar);
-       ar->regiontype= RGN_TYPE_HEADER;
-       ar->alignment= RGN_ALIGN_BOTTOM;
-       
+       ar->regiontype = RGN_TYPE_HEADER;
+       ar->alignment = RGN_ALIGN_BOTTOM;
        /* buttons/list view */
-       ar= MEM_callocN(sizeof(ARegion), "buttons for node");
-       
+       ar = MEM_callocN(sizeof(ARegion), "buttons for node");
        BLI_addtail(&snode->regionbase, ar);
-       ar->regiontype= RGN_TYPE_UI;
-       ar->alignment= RGN_ALIGN_RIGHT;
+       ar->regiontype = RGN_TYPE_UI;
+       ar->alignment = RGN_ALIGN_RIGHT;
        ar->flag = RGN_FLAG_HIDDEN;
-       
        /* main area */
-       ar= MEM_callocN(sizeof(ARegion), "main area for node");
-       
+       ar = MEM_callocN(sizeof(ARegion), "main area for node");
        BLI_addtail(&snode->regionbase, ar);
-       ar->regiontype= RGN_TYPE_WINDOW;
-       
+       ar->regiontype = RGN_TYPE_WINDOW;
        ar->v2d.tot.xmin =  -256.0f;
        ar->v2d.tot.ymin =  -256.0f;
        ar->v2d.tot.xmax = 768.0f;
@@@ -318,15 -315,12 +318,15 @@@ static void node_area_refresh(const str
  
  static SpaceLink *node_duplicate(SpaceLink *sl)
  {
-       SpaceNode *snoden= MEM_dupallocN(sl);
 +      SpaceImage *snode = (SpaceImage *) sl;
 -
+       SpaceNode *snoden = MEM_dupallocN(sl);
 +      
        /* clear or remove stuff from old */
-       snoden->nodetree= NULL;
-       snoden->linkdrag.first= snoden->linkdrag.last= NULL;
+       snoden->nodetree = NULL;
+       snoden->linkdrag.first = snoden->linkdrag.last = NULL;
  
 +      BKE_color_managed_view_settings_copy(&snoden->view_settings, &snode->view_settings);
 +
        return (SpaceLink *)snoden;
  }
  
index 166b7dd9024fa9e46140956774cc27b164bdbba9,dcb5cdd7d323886ba05e4f7cf3ffc34c43c8aa55..58b9d3742cc06f2ab0b35055a42647615093dce1
@@@ -120,12 -127,8 +127,14 @@@ typedef struct ImBuf 
        unsigned int   encodedsize;       /* Size of data written to encodedbuffer */
        unsigned int   encodedbuffersize; /* Size of encodedbuffer */
  
 +      /* color management */
 +      int colormanage_refcounter;
 +      unsigned int colormanage_flags;
 +      unsigned int *display_buffer_flags;  /* array of per-display display buffers dirty flags */
 +      void *colormanage_cache_data;        /* cache data which is being assigned when */
 +                                           /* put ImBuf to colormanage cache */
+       /* information for compressed textures */
+       struct DDSData dds_data;
  } ImBuf;
  
  /* Moved from BKE_bmfont_types.h because it is a userflag bit mask. */
index e355683b065550952a7747067570bc0e261f8192,68a094c26d0b13cc1c3fd61474edd4d9ab3ba180..0545bb33cb3d209589a7db30003e0ddb5cd91be6
@@@ -163,8 -162,8 +163,12 @@@ void IMB_freeImBuf(ImBuf *ibuf
                        IMB_freezbuffloatImBuf(ibuf);
                        freeencodedbufferImBuf(ibuf);
                        IMB_metadata_free(ibuf);
 -                      if (ibuf->dds_data.data != NULL)
 +                      IMB_colormanage_flags_free(ibuf);
 +                      IMB_colormanage_cache_data_free(ibuf);
++
++                      if (ibuf->dds_data.data != NULL) {
+                               free(ibuf->dds_data.data); /* dds_data.data is allocated by DirectDrawSurface::readData(), so don't use MEM_freeN! */
++                      }
                        MEM_freeN(ibuf);
                }
        }
Simple merge
index 2cc13224d6440457fa2e067921e33de4e391c1d3,d9ac43d7622e0e4445f9e4ede462d933c79c378f..14305721f859d4f4fe08c264e4da2ff6a07bee93
@@@ -912,12 -894,15 +912,16 @@@ endif(
                cycles_kernel
                cycles_util
                cycles_subd
-               bf_compositor #added for opencl compositor
-               bf_opencl #added for opencl compositor
                bf_intern_raskter
 +              bf_intern_opencolorio
        )
  
+       if(WITH_COMPOSITOR)
+               #added for opencl compositor
+               list(APPEND BLENDER_SORTED_LIBS bf_compositor)
+               list(APPEND BLENDER_SORTED_LIBS bf_opencl)
+       endif()
        if(WITH_LIBMV)
                list(APPEND BLENDER_SORTED_LIBS extern_libmv)
                list(APPEND BLENDER_SORTED_LIBS extern_ceres)