diff options
Diffstat (limited to 'source')
4 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index ae25aa77d98..1663cce4904 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -390,7 +390,8 @@ void DepsgraphRelationBuilder::begin_build() { } -void DepsgraphRelationBuilder::build_id(ID* id) { +void DepsgraphRelationBuilder::build_id(ID *id) +{ if (id == NULL) { return; } @@ -2060,7 +2061,8 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations() * * This is similar to what happens in ntree_hack_remap_pointers(). */ -void DepsgraphRelationBuilder::build_nested_datablock(ID *owner, ID *id) { +void DepsgraphRelationBuilder::build_nested_datablock(ID *owner, ID *id) +{ if (!DEG_depsgraph_use_copy_on_write()) { return; } diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc index 6484d1f21ad..19cc82a6b10 100644 --- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc +++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc @@ -73,7 +73,7 @@ DepsNodeFactory *deg_type_get_factory(const eDepsNode_Type type) /* Stringified node types ---------------------------------- */ -const char* nodeTypeAsString(eDepsNode_Type type) +const char *nodeTypeAsString(eDepsNode_Type type) { switch (type) { #define STRINGIFY_TYPE(name) case DEG_NODE_TYPE_##name: return #name @@ -110,7 +110,7 @@ const char* nodeTypeAsString(eDepsNode_Type type) /* Stringified opcodes ------------------------------------- */ -const char* operationCodeAsString(eDepsOperation_Code opcode) +const char *operationCodeAsString(eDepsOperation_Code opcode) { switch (opcode) { #define STRINGIFY_OPCODE(name) case DEG_OPCODE_##name: return #name diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 766f02c0d26..14cd62e6cec 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -155,7 +155,7 @@ typedef enum eDepsNode_Type { NUM_DEG_NODE_TYPES, } eDepsNode_Type; -const char* nodeTypeAsString(eDepsNode_Type type); +const char *nodeTypeAsString(eDepsNode_Type type); /* Identifiers for common operations (as an enum). */ typedef enum eDepsOperation_Code { @@ -270,6 +270,6 @@ typedef enum eDepsOperation_Code { DEG_NUM_OPCODES, } eDepsOperation_Code; -const char* operationCodeAsString(eDepsOperation_Code opcode); +const char *operationCodeAsString(eDepsOperation_Code opcode); } // namespace DEG diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 76f8f7bfd05..7a646d056b5 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -92,7 +92,7 @@ typedef struct WORKBENCH_MaterialData { float color[3]; int object_id; int drawtype; - Image* ima; + Image *ima; /* Linked shgroup for drawing */ DRWShadingGroup *shgrp; @@ -127,6 +127,6 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob void workbench_materials_cache_finish(WORKBENCH_Data *vedata); /* workbench_studiolight.c */ -void studiolight_update_world(int studio_light, WORKBENCH_UBO_World* wd); +void studiolight_update_world(int studio_light, WORKBENCH_UBO_World *wd); #endif |