Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_layer_types.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesdna/DNA_layer_types.h')
-rw-r--r--source/blender/makesdna/DNA_layer_types.h212
1 files changed, 106 insertions, 106 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index aa7ca2ca987..dd8adeaf153 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -29,124 +29,124 @@ extern "C" {
#include "DNA_listBase.h"
typedef struct Base {
- struct Base *next, *prev;
-
- /* Flags which are based on the collections flags evaluation, does not
- * include flags from object's restrictions. */
- short flag_from_collection;
-
- /* Final flags, including both accumulated collection flags and object's
- * restriction flags. */
- short flag;
-
- unsigned short local_view_bits;
- short sx, sy;
- char _pad1[6];
- struct Object *object;
- unsigned int lay DNA_DEPRECATED;
- int flag_legacy;
-
- /* Pointer to an original base. Is initialized for evaluated view layer.
- * NOTE: Only allowed to be accessed from within active dependency graph. */
- struct Base *base_orig;
- void *_pad;
+ struct Base *next, *prev;
+
+ /* Flags which are based on the collections flags evaluation, does not
+ * include flags from object's restrictions. */
+ short flag_from_collection;
+
+ /* Final flags, including both accumulated collection flags and object's
+ * restriction flags. */
+ short flag;
+
+ unsigned short local_view_bits;
+ short sx, sy;
+ char _pad1[6];
+ struct Object *object;
+ unsigned int lay DNA_DEPRECATED;
+ int flag_legacy;
+
+ /* Pointer to an original base. Is initialized for evaluated view layer.
+ * NOTE: Only allowed to be accessed from within active dependency graph. */
+ struct Base *base_orig;
+ void *_pad;
} Base;
typedef struct ViewLayerEngineData {
- struct ViewLayerEngineData *next, *prev;
- struct DrawEngineType *engine_type;
- void *storage;
- void (*free)(void *storage);
+ struct ViewLayerEngineData *next, *prev;
+ struct DrawEngineType *engine_type;
+ void *storage;
+ void (*free)(void *storage);
} ViewLayerEngineData;
typedef struct LayerCollection {
- struct LayerCollection *next, *prev;
- struct Collection *collection;
- struct SceneCollection *scene_collection DNA_DEPRECATED;
- short flag;
- short runtime_flag;
- char _pad[4];
- /** Synced with collection->children. */
- ListBase layer_collections;
+ struct LayerCollection *next, *prev;
+ struct Collection *collection;
+ struct SceneCollection *scene_collection DNA_DEPRECATED;
+ short flag;
+ short runtime_flag;
+ char _pad[4];
+ /** Synced with collection->children. */
+ ListBase layer_collections;
} LayerCollection;
typedef struct ViewLayer {
- struct ViewLayer *next, *prev;
- /** MAX_NAME. */
- char name[64];
- short flag;
- char _pad[6];
- /** ObjectBase. */
- ListBase object_bases;
- /** Default allocated now. */
- struct SceneStats *stats;
- struct Base *basact;
- /** LayerCollection. */
- ListBase layer_collections;
- LayerCollection *active_collection;
-
- /* Old SceneRenderLayer data. */
- int layflag;
- /** Pass_xor has to be after passflag. */
- int passflag;
- float pass_alpha_threshold;
- int samples;
-
- struct Material *mat_override;
- /** Equivalent to datablocks ID properties. */
- struct IDProperty *id_properties;
-
- struct FreestyleConfig freestyle_config;
-
- /* Runtime data */
- /** ViewLayerEngineData. */
- ListBase drawdata;
- struct Base **object_bases_array;
- struct GHash *object_bases_hash;
+ struct ViewLayer *next, *prev;
+ /** MAX_NAME. */
+ char name[64];
+ short flag;
+ char _pad[6];
+ /** ObjectBase. */
+ ListBase object_bases;
+ /** Default allocated now. */
+ struct SceneStats *stats;
+ struct Base *basact;
+ /** LayerCollection. */
+ ListBase layer_collections;
+ LayerCollection *active_collection;
+
+ /* Old SceneRenderLayer data. */
+ int layflag;
+ /** Pass_xor has to be after passflag. */
+ int passflag;
+ float pass_alpha_threshold;
+ int samples;
+
+ struct Material *mat_override;
+ /** Equivalent to datablocks ID properties. */
+ struct IDProperty *id_properties;
+
+ struct FreestyleConfig freestyle_config;
+
+ /* Runtime data */
+ /** ViewLayerEngineData. */
+ ListBase drawdata;
+ struct Base **object_bases_array;
+ struct GHash *object_bases_hash;
} ViewLayer;
/* Base->flag */
enum {
- /* User controlled flags. */
- BASE_SELECTED = (1 << 0), /* Object is selected. */
- BASE_HIDDEN = (1 << 8), /* Object is hidden for editing. */
-
- /* Runtime evaluated flags. */
- BASE_VISIBLE = (1 << 1), /* Object is enabled and visible. */
- BASE_SELECTABLE = (1 << 2), /* Object can be selected. */
- BASE_FROM_DUPLI = (1 << 3), /* Object comes from duplicator. */
- /* BASE_DEPRECATED = (1 << 4), */
- BASE_FROM_SET = (1 << 5), /* Object comes from set. */
- BASE_ENABLED_VIEWPORT = (1 << 6), /* Object is enabled in viewport. */
- BASE_ENABLED_RENDER = (1 << 7), /* Object is enabled in final render */
- /* BASE_DEPRECATED = (1 << 9), */
- BASE_HOLDOUT = (1 << 10), /* Object masked out from render */
- BASE_INDIRECT_ONLY = (1 << 11), /* Object only contributes indirectly to render */
+ /* User controlled flags. */
+ BASE_SELECTED = (1 << 0), /* Object is selected. */
+ BASE_HIDDEN = (1 << 8), /* Object is hidden for editing. */
+
+ /* Runtime evaluated flags. */
+ BASE_VISIBLE = (1 << 1), /* Object is enabled and visible. */
+ BASE_SELECTABLE = (1 << 2), /* Object can be selected. */
+ BASE_FROM_DUPLI = (1 << 3), /* Object comes from duplicator. */
+ /* BASE_DEPRECATED = (1 << 4), */
+ BASE_FROM_SET = (1 << 5), /* Object comes from set. */
+ BASE_ENABLED_VIEWPORT = (1 << 6), /* Object is enabled in viewport. */
+ BASE_ENABLED_RENDER = (1 << 7), /* Object is enabled in final render */
+ /* BASE_DEPRECATED = (1 << 9), */
+ BASE_HOLDOUT = (1 << 10), /* Object masked out from render */
+ BASE_INDIRECT_ONLY = (1 << 11), /* Object only contributes indirectly to render */
};
/* LayerCollection->flag */
enum {
- /* LAYER_COLLECTION_DEPRECATED0 = (1 << 0), */
- /* LAYER_COLLECTION_DEPRECATED1 = (1 << 1), */
- /* LAYER_COLLECTION_DEPRECATED2 = (1 << 2), */
- /* LAYER_COLLECTION_DEPRECATED3 = (1 << 3), */
- LAYER_COLLECTION_EXCLUDE = (1 << 4),
- LAYER_COLLECTION_HOLDOUT = (1 << 5),
- LAYER_COLLECTION_INDIRECT_ONLY = (1 << 6),
- LAYER_COLLECTION_RESTRICT_VIEW = (1 << 7),
+ /* LAYER_COLLECTION_DEPRECATED0 = (1 << 0), */
+ /* LAYER_COLLECTION_DEPRECATED1 = (1 << 1), */
+ /* LAYER_COLLECTION_DEPRECATED2 = (1 << 2), */
+ /* LAYER_COLLECTION_DEPRECATED3 = (1 << 3), */
+ LAYER_COLLECTION_EXCLUDE = (1 << 4),
+ LAYER_COLLECTION_HOLDOUT = (1 << 5),
+ LAYER_COLLECTION_INDIRECT_ONLY = (1 << 6),
+ LAYER_COLLECTION_RESTRICT_VIEW = (1 << 7),
};
/* Layer Collection->runtime_flag */
enum {
- LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
- LAYER_COLLECTION_VISIBLE = (1 << 1),
+ LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
+ LAYER_COLLECTION_VISIBLE = (1 << 1),
};
/* ViewLayer->flag */
enum {
- VIEW_LAYER_RENDER = (1 << 0),
- /* VIEW_LAYER_DEPRECATED = (1 << 1), */
- VIEW_LAYER_FREESTYLE = (1 << 2),
+ VIEW_LAYER_RENDER = (1 << 0),
+ /* VIEW_LAYER_DEPRECATED = (1 << 1), */
+ VIEW_LAYER_FREESTYLE = (1 << 2),
};
/****************************** Deprecated ******************************/
@@ -156,22 +156,22 @@ enum {
#define USE_COLLECTION_COMPAT_28
typedef struct SceneCollection {
- struct SceneCollection *next, *prev;
- /** MAX_NAME. */
- char name[64];
- /** For UI. */
- int active_object_index;
- short flag;
- char type;
- char _pad;
- /** (Object *)LinkData->data. */
- ListBase objects;
- /** Nested collections. */
- ListBase scene_collections;
+ struct SceneCollection *next, *prev;
+ /** MAX_NAME. */
+ char name[64];
+ /** For UI. */
+ int active_object_index;
+ short flag;
+ char type;
+ char _pad;
+ /** (Object *)LinkData->data. */
+ ListBase objects;
+ /** Nested collections. */
+ ListBase scene_collections;
} SceneCollection;
#ifdef __cplusplus
}
#endif
-#endif /* __DNA_LAYER_TYPES_H__ */
+#endif /* __DNA_LAYER_TYPES_H__ */