[Bf-blender-cvs] [dcded195077] master: Overlay: Armature: Fix Crash entering armature edit mode

Clément Foucault noreply at git.blender.org
Tue Dec 3 16:15:05 CET 2019


Commit: dcded19507789ee59b6cda54f678802bd6a3ff69
Author: Clément Foucault
Date:   Tue Dec 3 16:14:47 2019 +0100
Branches: master
https://developer.blender.org/rBdcded19507789ee59b6cda54f678802bd6a3ff69

Overlay: Armature: Fix Crash entering armature edit mode

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

M	source/blender/draw/engines/overlay/overlay_armature.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 8930ccb94b3..a45397e9d81 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -999,7 +999,8 @@ static const float *get_bone_solid_with_consts_color(const ArmatureDrawContext *
   const float *col = get_bone_solid_color(ctx, eBone, pchan, arm, boneflag, constflag);
 
   static float consts_color[4];
-  if (set_pchan_color(ctx, PCHAN_COLOR_CONSTS, boneflag, constflag, consts_color)) {
+  if ((arm->flag & ARM_POSEMODE) &&
+      set_pchan_color(ctx, PCHAN_COLOR_CONSTS, boneflag, constflag, consts_color)) {
     interp_v3_v3v3(consts_color, col, consts_color, 0.5f);
   }
   else {



More information about the Bf-blender-cvs mailing list