[Bf-blender-cvs] [86e359b03b7] soc-2021-porting-modifiers-to-nodes-decimate: - reverted unrelated changes

[Fabian Schempp]

Commit: 86e359b03b772b0bc3d153ac3cbd54a47afa8f00
Author: Fabian Schempp
Date:   Fri Jul 30 21:07:29 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB86e359b03b772b0bc3d153ac3cbd54a47afa8f00

- reverted unrelated changes

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

M	source/blender/compositor/intern/COM_ExecutionSystem.cc
M	source/blender/draw/engines/overlay/overlay_armature.c
M	source/blender/editors/space_view3d/space_view3d.c

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

diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cc b/source/blender/compositor/intern/COM_ExecutionSystem.cc
index d41ca872f03..c92e292c74f 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cc
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cc
@@ -83,7 +83,6 @@ ExecutionSystem::ExecutionSystem(RenderData *rd,
       BLI_assert_msg(0, "Non implemented execution model");
       break;
   }
-  num_work_threads_ = WorkScheduler::get_num_cpu_threads();
 }
 
 ExecutionSystem::~ExecutionSystem()
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 9d15f0e176d..1da682ff01b 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -1294,10 +1294,9 @@ static void draw_axes(ArmatureDrawContext *ctx,
                       const bArmature *arm)
 {
   float final_col[4];
-  const float *col = (ctx->const_color) ?
-                         ctx->const_color :
-                         (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi :
-                                                                     G_draw.block.colorText;
+  const float *col = (ctx->const_color)                        ? ctx->const_color :
+                     (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi :
+                                                                 G_draw.block.colorText;
   copy_v4_v4(final_col, col);
   /* Mix with axes color. */
   final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65;
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 5baa12f7367..c2940b08633 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -53,7 +53,6 @@
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
 
-#include "ED_asset.h"
 #include "ED_render.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"