[Bf-blender-cvs] [11df07e] asset-experiments: Merge branch 'master' into asset-experiments

Bastien Montagne noreply at git.blender.org
Mon Mar 30 12:31:31 CEST 2015


Commit: 11df07e53fcb1ade426e434aa7560e4dfe27f82e
Author: Bastien Montagne
Date:   Mon Mar 30 11:56:35 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB11df07e53fcb1ade426e434aa7560e4dfe27f82e

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/editors/include/UI_interface_icons.h
	source/blender/editors/space_file/filelist.h

===================================================================



===================================================================

diff --cc source/blender/editors/include/UI_interface_icons.h
index c721af1,9d190fa..6303325
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@@ -34,13 -34,6 +34,7 @@@
  
  struct bContext;
  struct ID;
 +struct Scene;
- struct Image;
- struct ImBuf;
- struct World;
- struct Tex;
- struct Lamp;
- struct Material;
  struct PreviewImage;
  struct PointerRNA;
  
diff --cc source/blender/editors/space_file/filelist.h
index 794f53b,44e0a51..2b19443
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@@ -40,15 -40,9 +40,10 @@@ extern "C" 
  struct BlendHandle;
  struct FileList;
  struct FileSelection;
- struct FolderList;
- struct Main;
- struct ReportList;
- struct Scene;
- struct rcti;
 -struct direntry;
  struct wmWindowManager;
  
 +struct FileDirEntry;
 +
  typedef enum FileSelType {
  	FILE_SEL_REMOVE = 0,
  	FILE_SEL_ADD    = 1,
diff --cc source/blender/makesdna/DNA_space_types.h
index b55253d,dff6d3c..b03749c
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -71,10 -65,8 +65,9 @@@ struct wmTimer
  struct MovieClip;
  struct MovieClipScopes;
  struct Mask;
- struct GHash;
  struct BLI_mempool;
  
 +struct direntry;
  
  /* SpaceLink (Base) ==================================== */




More information about the Bf-blender-cvs mailing list