[Bf-blender-cvs] [e7992b12794] hair_guides: Merge branch 'blender2.8' into hair_guides

Lukas Tönne noreply at git.blender.org
Mon May 7 10:36:31 CEST 2018


Commit: e7992b1279441327e8c889ce506d444d5d64b010
Author: Lukas Tönne
Date:   Mon May 7 09:31:45 2018 +0100
Branches: hair_guides
https://developer.blender.org/rBe7992b1279441327e8c889ce506d444d5d64b010

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc source/blender/draw/modes/object_mode.c
index 5105cd74e21,1cfc8e9403d..9794240c025
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -108,8 -104,8 +108,9 @@@ typedef struct OBJECT_PassList 
  	struct DRWPass *bone_outline;
  	struct DRWPass *bone_wire;
  	struct DRWPass *bone_envelope;
+ 	struct DRWPass *bone_axes;
  	struct DRWPass *particle;
 +	struct DRWPass *hair;
  	struct DRWPass *lightprobes;
  	/* use for empty/background images */
  	struct DRWPass *reference_image;



More information about the Bf-blender-cvs mailing list