[Bf-blender-cvs] [080deff077b] asset-engine: Merge branch 'master' into asset-engine

Bastien Montagne noreply at git.blender.org
Wed Jan 9 17:14:37 CET 2019


Commit: 080deff077b4bcf0b4abbc7dc4489e539f22b59c
Author: Bastien Montagne
Date:   Wed Jan 9 13:46:58 2019 +0100
Branches: asset-engine
https://developer.blender.org/rB080deff077b4bcf0b4abbc7dc4489e539f22b59c

Merge branch 'master' into asset-engine

 Conflicts:
	source/blender/makesdna/DNA_ID.h
	source/blender/makesdna/DNA_space_types.h

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



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

diff --cc source/blender/makesdna/DNA_ID.h
index e4cf030fb06,d373a1542c6..72af7dd354a
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -297,12 -256,11 +308,14 @@@ typedef struct ID 
  	int pad;
  	IDProperty *properties;
  
- 	IDOverrideStatic *override_static;  /* Reference linked ID which this one overrides. */
+ 	/** Reference linked ID which this one overrides. */
+ 	IDOverrideStatic *override_static;
  
 +	AssetUUID *uuid;
 +	void *pad_v;
 +
- 	/* Only set for datablocks which are coming from copy-on-write, points to
+ 	/**
+ 	 * Only set for datablocks which are coming from copy-on-write, points to
  	 * the original version of it.
  	 */
  	struct ID *orig_id;
@@@ -349,35 -275,29 +362,44 @@@ typedef struct AssetRepositoryRef 
  typedef struct Library {
  	ID id;
  	struct FileData *filedata;
++<<<<<<< HEAD
 +	/* path name used for reading, can be relative and edited in the outliner. */
++=======
+ 	/** Path name used for reading, can be relative and edited in the outliner. */
++>>>>>>> master
  	char name[1024];
  
- 	/* absolute filepath, this is only for convenience, 'name' is the real path used on file read but in
+ 	/**
+ 	 * Absolute filepath, this is only for convenience,
+ 	 * 'name' is the real path used on file read but in
  	 * some cases its useful to access the absolute one.
  	 * This is set on file read.
- 	 * Use BKE_library_filepath_set() rather than setting 'name' directly and it will be kept in sync - campbell */
+ 	 * Use BKE_library_filepath_set() rather than setting 'name'
+ 	 * directly and it will be kept in sync - campbell */
  	char filepath[1024];
  
- 	struct Library *parent;	/* set for indirectly linked libs, used in the outliner and while reading */
+ 	/** Set for indirectly linked libs, used in the outliner and while reading. */
+ 	struct Library *parent;
  
  	struct PackedFile *packedfile;
  
 +	AssetRepositoryRef *asset_repository;
 +
 +	short flag;
 +	short pad_s1[3];
 +
  	/* Temp data needed by read/write code. */
  	int temp_index;
- 	short versionfile, subversionfile;  /* see BLENDER_VERSION, BLENDER_SUBVERSION, needed for do_versions */
+ 	/** See BLENDER_VERSION, BLENDER_SUBVERSION, needed for do_versions. */
+ 	short versionfile, subversionfile;
  } Library;
  
 +/* Library.flag */
 +enum {
 +	/* The library does not actually exist, used to allow handling of files from asset engines. */
 +	LIBRARY_FLAG_VIRTUAL = 1 << 0,
 +};
 +
  enum eIconSizes {
  	ICON_SIZE_ICON = 0,
  	ICON_SIZE_PREVIEW = 1,
diff --cc source/blender/makesdna/DNA_space_types.h
index a513f86a443,5cb66c2bfb1..e442a60910d
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -667,14 -722,16 +722,18 @@@ typedef struct SpaceFile 
  	char _pad1[4];
  	int scroll_offset;
  
- 	char asset_engine[64];  /* BKE_ST_MAXNAME */
 -	/** Config and input for file select. */
++	/* BKE_ST_MAXNAME */
++	char asset_engine[64];
 +
- 	struct FileSelectParams *params; /* config and input for file select */
+ 	struct FileSelectParams *params;
  
- 	struct FileList *files; /* holds the list of files to show */
+ 	/** Holds the list of files to show. */
+ 	struct FileList *files;
  
- 	ListBase *folders_prev; /* holds the list of previous directories to show */
- 	ListBase *folders_next; /* holds the list of next directories (pushed from previous) to show */
+ 	/** Holds the list of previous directories to show. */
+ 	ListBase *folders_prev;
+ 	/** Holds the list of next directories (pushed from previous) to show. */
+ 	ListBase *folders_next;
  
  	/* operator that is invoking fileselect
  	 * op->exec() will be called on the 'Load' button.
@@@ -841,10 -903,12 +900,12 @@@ typedef struct FileDirEntry 
  	char *description;
  
  	/* Either point to active variant/revision if available, or own entry (in mere filebrowser case). */
 -	FileDirEntryRevision *entry;
 +	FileDirEntryView *entry;
  
- 	int typeflag;  /* eFileSel_File_Types */
- 	int blentype;  /* ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */
+ 	/** #eFileSel_File_Types. */
+ 	int typeflag;
+ 	/** ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */
+ 	int blentype;
  
  	char *relpath;
  
@@@ -874,8 -939,10 +936,9 @@@ typedef struct FileDirEntryArr 
  	ListBase entries;
  	int nbr_entries;
  	int nbr_entries_filtered;
 -	int entry_idx_start, entry_idx_end;
  
- 	char root[1024];	 /* FILE_MAX */
+ 	/** FILE_MAX. */
+ 	char root[1024];
  } FileDirEntryArr;
  
  /* FileDirEntry.status */



More information about the Bf-blender-cvs mailing list