[Bf-blender-cvs] [82bb7ee9436] temp-viewport-compositor-merge: Realtime Compositor: Cleanup split viewer node

Omar Emara noreply at git.blender.org
Tue Jun 28 13:07:11 CEST 2022


Commit: 82bb7ee94362617e6e69be8784fad2e67b3ddec1
Author: Omar Emara
Date:   Thu Jun 16 16:01:58 2022 +0200
Branches: temp-viewport-compositor-merge
https://developer.blender.org/rB82bb7ee94362617e6e69be8784fad2e67b3ddec1

Realtime Compositor: Cleanup split viewer node

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

M	source/blender/makesdna/DNA_node_types.h
M	source/blender/nodes/composite/nodes/node_composite_split_viewer.cc

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

diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 25c8a1f1514..89ab39902b4 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1828,6 +1828,12 @@ enum {
 /* viewer and composite output. */
 #define CMP_NODE_OUTPUT_IGNORE_ALPHA 1
 
+/* Split Viewer Node. Stored in custom2. */
+enum {
+  CMP_NODE_SPLIT_VIEWER_HORIZONTAL = 0,
+  CMP_NODE_SPLIT_VIEWER_VERTICAL = 1,
+};
+
 /* Plane track deform node. */
 
 enum {
diff --git a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc
index a16421dfae3..2f81143e84e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc
@@ -90,15 +90,13 @@ class ViewerOperation : public NodeOperation {
 
   GPUShader *get_split_viewer_shader()
   {
-    if (get_split_axis() == 0) {
+    if (get_split_axis() == CMP_NODE_SPLIT_VIEWER_HORIZONTAL) {
       return shader_pool().acquire("compositor_split_viewer_horizontal");
     }
 
     return shader_pool().acquire("compositor_split_viewer_vertical");
   }
 
-  /* 0 -> Split Horizontal.
-   * 1 -> Split Vertical. */
   int get_split_axis()
   {
     return bnode().custom2;



More information about the Bf-blender-cvs mailing list