diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-08 23:45:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-08 23:45:21 +0300 |
commit | 46c073e4ac38fae5209b82284313b740b132fd66 (patch) | |
tree | e4f85fe5418c5085510f3ca98249ece28a470f4a /source | |
parent | c71e160c022abf0cc8425970e31c09ded15763a2 (diff) |
Cleanup: cmake indentation, missing include
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/depsgraph/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 1 | ||||
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index b664af570b1..33a7628c68d 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -87,6 +87,7 @@ set(SRC intern/depsgraph_intern.h intern/depsgraph_types.h + util/deg_util_foreach.h util/deg_util_function.h ) diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 4b0ba6942e4..174feec0e22 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -533,7 +533,6 @@ static int gp_strokes_paste_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); bGPdata *gpd = ED_gpencil_data_get_active(C); bGPDlayer *gpl = CTX_data_active_gpencil_layer(C); /* only use active for copy merge */ - bGPDpalette *palette = CTX_data_active_gpencil_palette(C); bGPDframe *gpf; eGP_PasteMode type = RNA_enum_get(op->ptr, "type"); diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index a95a99449fd..8139e29bade 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -117,7 +117,7 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node, else { sock = BLI_findlink(&node->outputs, sock_index); NodeImageLayer *sockdata = sock->storage; - if(sockdata) { + if (sockdata) { BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name)); } } |