[Bf-blender-cvs] [a7e1963b634] master: Cleanup: remove G.debug_value check for old mesh-deform behavior

[Campbell Barton]

Commit: a7e1963b634fc7deb072586d1faee76aa2669c90
Author: Campbell Barton
Date:   Wed Aug 26 21:01:38 2020 +1000
Branches: master
https://developer.blender.org/rBa7e1963b634fc7deb072586d1faee76aa2669c90

Cleanup: remove G.debug_value check for old mesh-deform behavior

Added in 2007, it doesn't seem useful to support alternate behavior.

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

M       source/blender/blenkernel/BKE_global.h
M       source/blender/modifiers/intern/MOD_meshdeform.c

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

diff --git a/source/blender/blenkernel/BKE_global.h 
b/source/blender/blenkernel/BKE_global.h
index 9ffd496616d..5e16c9c979c 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -71,7 +71,6 @@ typedef struct Global {
    *   *     -1: Disable faster motion paths computation (since 08/2018).
    *   * 1 - 30: EEVEE debug/stats values (01/2018).
    *   *    101: Enable UI debug drawing of fullscreen area's corner widget 
(10/2014).
-   *   *    527: Old mysterious switch in behavior of MeshDeform modifier 
(before 04/2010).
    *   *    666: Use quicker batch delete for outliners' delete hierarchy 
(01/2019).
    *   *    777: Enable UI node panel's sockets polling (11/2011).
    *   *    799: Enable some mysterious new depsgraph behavior (05/2015).
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c 
b/source/blender/modifiers/intern/MOD_meshdeform.c
index ae031bffb04..79d666d9e2a 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -37,7 +37,6 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
-#include "BKE_global.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
 #include "BKE_mesh.h"
@@ -332,12 +331,7 @@ static void meshdeform_vert_task(void *__restrict userdata,
   if (totweight > 0.0f) {
     mul_v3_fl(co, fac / totweight);
     mul_m3_v3(data->icagemat, co);
-    if (G.debug_value != 527) {
-      add_v3_v3(vertexCos[iter], co);
-    }
-    else {
-      copy_v3_v3(vertexCos[iter], co);
-    }
+    add_v3_v3(vertexCos[iter], co);
   }
 }
 
@@ -435,14 +429,9 @@ static void meshdeformModifier_do(ModifierData *md,
     /* get cage vertex in world space with binding transform */
     copy_v3_v3(co, cagecos[a]);
 
-    if (G.debug_value != 527) {
-      mul_m4_v3(mmd->bindmat, co);
-      /* compute difference with world space bind coord */
-      sub_v3_v3v3(dco[a], co, bindcagecos[a]);
-    }
-    else {
-      copy_v3_v3(dco[a], co);
-    }
+    mul_m4_v3(mmd->bindmat, co);
+    /* compute difference with world space bind coord */
+    sub_v3_v3v3(dco[a], co, bindcagecos[a]);
   }
 
   MOD_get_vgroup(ob, mesh, mmd->defgrp_name, &dvert, &defgrp_index);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs