diff options
Diffstat (limited to 'source/blender/compositor/nodes')
12 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index d595afe6a78..5571a186333 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -96,11 +96,11 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c /* Passes in the file can differ from passes stored in sockets (#36755). * Look up the correct file pass using the socket identifier instead. */ - #if 0 +#if 0 NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage;*/ int passindex = storage->pass_index;*/ RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex); - #endif +#endif int passindex; RenderPass *rpass; for (rpass = (RenderPass *)rl->passes.first, passindex = 0; rpass; rpass = rpass->next, ++passindex) diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 12b4da6c8b3..c8d53b405a0 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -26,7 +26,7 @@ #include "DNA_node_types.h" #include "DNA_image_types.h" extern "C" { - #include "RE_engine.h" +# include "RE_engine.h" } /** diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp index cd1f79235ea..59d889d0c84 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp @@ -26,7 +26,7 @@ #include "COM_KeyingScreenOperation.h" extern "C" { - #include "DNA_movieclip_types.h" +# include "DNA_movieclip_types.h" } KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp index 8d549d09362..65ff443b55b 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cpp +++ b/source/blender/compositor/nodes/COM_MaskNode.cpp @@ -26,7 +26,7 @@ #include "COM_MaskOperation.h" extern "C" { - #include "DNA_mask_types.h" +# include "DNA_mask_types.h" } MaskNode::MaskNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp index 10dd72ec7bf..041fa9f7c4c 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp @@ -27,10 +27,10 @@ #include "COM_ConvertColorProfileOperation.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "BKE_movieclip.h" - #include "BKE_tracking.h" - #include "IMB_imbuf.h" +# include "DNA_movieclip_types.h" +# include "BKE_movieclip.h" +# include "BKE_tracking.h" +# include "IMB_imbuf.h" } MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp index de12fff3591..5155b55a2ec 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.cpp +++ b/source/blender/compositor/nodes/COM_MuteNode.cpp @@ -27,7 +27,7 @@ #include "COM_SetColorOperation.h" extern "C" { - #include "BLI_listbase.h" +# include "BLI_listbase.h" } MuteNode::MuteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h index 2e5250e625e..7b0f1c2c298 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.h +++ b/source/blender/compositor/nodes/COM_MuteNode.h @@ -28,7 +28,7 @@ #include "COM_Node.h" extern "C" { - #include "BKE_node.h" +# include "BKE_node.h" } /** diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp index d6434c26c7d..f52c696b772 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp @@ -28,9 +28,9 @@ #include "COM_PlaneTrackWarpImageOperation.h" extern "C" { - #include "BKE_node.h" - #include "BKE_movieclip.h" - #include "BKE_tracking.h" +# include "BKE_node.h" +# include "BKE_movieclip.h" +# include "BKE_tracking.h" } PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h index cf173cd19f9..3c37f4474dd 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h @@ -23,8 +23,8 @@ #include "DNA_node_types.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "DNA_node_types.h" +# include "DNA_movieclip_types.h" +# include "DNA_node_types.h" } /** diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp index a579503a829..8f17c4d9345 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp @@ -29,8 +29,8 @@ #include "COM_SetSamplerOperation.h" extern "C" { - #include "DNA_movieclip_types.h" - #include "BKE_tracking.h" +# include "DNA_movieclip_types.h" +# include "BKE_tracking.h" } Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 00ca797bd9b..83f99a16d9f 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -24,7 +24,7 @@ #include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" extern "C" { - #include "BKE_colortools.h" +# include "BKE_colortools.h" } #include "BLI_utildefines.h" diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp index c5474e0ce70..bb8cecc60ad 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp @@ -26,9 +26,9 @@ #include "COM_TrackPositionOperation.h" extern "C" { - #include "DNA_movieclip_types.h" +# include "DNA_movieclip_types.h" - #include "BKE_node.h" +# include "BKE_node.h" } TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode) |