Cycles: svn merge -r41266:41467 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 2 Nov 2011 16:17:05 +0000 (16:17 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 2 Nov 2011 16:17:05 +0000 (16:17 +0000)
28 files changed:
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/readimage.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/makesrna/intern/rna_world.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/windowmanager/intern/wm_event_system.c
source/creator/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -755,11 -749,7 +755,11 @@@ void uiTemplateTextureImage(uiLayout *l
  void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
  void uiTemplateKeymapItemProperties(uiLayout *layout, struct PointerRNA *ptr);
  
- void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, int rows, int maxrows, int type);
+ void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, const char *prop_list, int rows, int maxrows, int type);
 +void uiTemplateNodeLink(uiLayout *layout, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input);
 +void uiTemplateNodeView(uiLayout *layout, struct bContext *C, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input);
 +void uiTemplateTextureUser(uiLayout *layout, struct bContext *C);
 +void uiTemplateTextureShow(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop);
  
  /* items */
  void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname);
Simple merge
  #include "IMB_imbuf.h"
  #include "IMB_filetype.h"
  
- ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags)
 +static ImBuf *imb_ibImageFromFile(const char *filepath, int flags)
 +{
 +      ImBuf *ibuf;
 +      ImFileType *type;
 +
 +      for(type=IMB_FILE_TYPES; type->is_a; type++) {
 +              if(type->load_filepath) {
 +                      ibuf= type->load_filepath(filepath, flags);
 +                      if(ibuf) {
 +                              if(flags & IB_premul) {
 +                                      IMB_premultiply_alpha(ibuf);
 +                                      ibuf->flags |= IB_premul;
 +                              }
 +
 +                              return ibuf;
 +                      }
 +              }
 +      }
 +      
 +      return NULL;
 +}
 +
+ ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags, const char *descr)
  {
        ImBuf *ibuf;
        ImFileType *type;
@@@ -143,25 -122,20 +144,25 @@@ ImBuf *IMB_loadiffname(const char *file
  {
        ImBuf *ibuf;
        int file, a;
-       char filename[IB_FILENAME_SIZE];
+       char filepath_tx[IB_FILENAME_SIZE];
  
-       imb_cache_filename(filename, name, flags);
+       imb_cache_filename(filepath_tx, filepath, flags);
  
-       ibuf= imb_ibImageFromFile(name, flags);
 -      file = open(filepath_tx, O_BINARY|O_RDONLY);
 -      if(file < 0) return NULL;
++      ibuf= imb_ibImageFromFile(filepath_tx, flags);
 +
 +      if(!ibuf) {
-               file = open(filename, O_BINARY|O_RDONLY);
++              file = open(filepath_tx, O_BINARY|O_RDONLY);
 +              if(file < 0) return NULL;
  
-               ibuf= IMB_loadifffile(file, flags);
 -      ibuf= IMB_loadifffile(file, flags, filepath_tx);
++              ibuf= IMB_loadifffile(file, flags, filepath_tx);
 +              close(file);
 +      }
  
        if(ibuf) {
-               BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
-               BLI_strncpy(ibuf->cachename, filename, sizeof(ibuf->cachename));
+               BLI_strncpy(ibuf->name, filepath, sizeof(ibuf->name));
+               BLI_strncpy(ibuf->cachename, filepath_tx, sizeof(ibuf->cachename));
                for(a=1; a<ibuf->miptot; a++)
-                       BLI_strncpy(ibuf->mipmap[a-1]->cachename, filename, sizeof(ibuf->cachename));
+                       BLI_strncpy(ibuf->mipmap[a-1]->cachename, filepath_tx, sizeof(ibuf->cachename));
                if(flags & IB_fields) IMB_de_interlace(ibuf);
        }
  
Simple merge