[Bf-blender-cvs] [67685e4b4db] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

Campbell Barton noreply at git.blender.org
Fri Mar 31 08:10:22 CEST 2017


Commit: 67685e4b4db45abca944f740fb944598b2230314
Author: Campbell Barton
Date:   Fri Mar 31 17:11:40 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rB67685e4b4db45abca944f740fb944598b2230314

Merge branch 'blender2.8' into custom-manipulators

Note, this doesn't use the changes from 2.8x, since the code was so different.
Move to use imm API will need to be done manually.

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index e0cd474ea92,9072f963460..8572813aa06
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -82,27 -76,34 +82,29 @@@
  /* local module include */
  #include "transform.h"
  
 +#include "MEM_guardedalloc.h"
 +
  #include "GPU_select.h"
+ #include "GPU_immediate.h"
+ #include "GPU_matrix.h"
  
 -/* return codes for select, and drawing flags */
 -
 -#define MAN_TRANS_X		(1 << 0)
 -#define MAN_TRANS_Y		(1 << 1)
 -#define MAN_TRANS_Z		(1 << 2)
 -#define MAN_TRANS_C		(MAN_TRANS_X | MAN_TRANS_Y | MAN_TRANS_Z)
  
 -#define MAN_ROT_X		(1 << 3)
 -#define MAN_ROT_Y		(1 << 4)
 -#define MAN_ROT_Z		(1 << 5)
 -#define MAN_ROT_V		(1 << 6)
 -#define MAN_ROT_T		(1 << 7)
 -#define MAN_ROT_C		(MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z | MAN_ROT_V | MAN_ROT_T)
 +/* drawing flags */
  
 -#define MAN_SCALE_X		(1 << 8)
 -#define MAN_SCALE_Y		(1 << 9)
 -#define MAN_SCALE_Z		(1 << 10)
 -#define MAN_SCALE_C		(MAN_SCALE_X | MAN_SCALE_Y | MAN_SCALE_Z)
 +#define MAN_TRANS_X  (1 << 0)
 +#define MAN_TRANS_Y  (1 << 1)
 +#define MAN_TRANS_Z  (1 << 2)
 +#define MAN_TRANS_C  (MAN_TRANS_X | MAN_TRANS_Y | MAN_TRANS_Z)
  
 -/* color codes */
 +#define MAN_ROT_X    (1 << 3)
 +#define MAN_ROT_Y    (1 << 4)
 +#define MAN_ROT_Z    (1 << 5)
 +#define MAN_ROT_C    (MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z)
  
 -#define MAN_RGB     0
 -#define MAN_GHOST   1
 -#define MAN_MOVECOL 2
 +#define MAN_SCALE_X  (1 << 8)
 +#define MAN_SCALE_Y  (1 << 9)
 +#define MAN_SCALE_Z  (1 << 10)
 +#define MAN_SCALE_C  (MAN_SCALE_X | MAN_SCALE_Y | MAN_SCALE_Z)
  
  /* threshold for testing view aligned manipulator axis */
  #define TW_AXIS_DOT_MIN 0.02f




More information about the Bf-blender-cvs mailing list