svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22935:23022
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 Sep 2009 08:31:03 +0000 (08:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 Sep 2009 08:31:03 +0000 (08:31 +0000)
looks like 2 merges are needed to skip a commit.

1  2 
source/blender/blenkernel/intern/curve.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/makesdna/DNA_curve_types.h

Simple merge
@@@ -223,8 -204,9 +223,10 @@@ typedef struct Curve 
  #define CU_OFFS_PATHDIST      256
  #define CU_FAST                       512 /* Font: no filling inside editmode */
  #define CU_RETOPO               1024
 +#define CU_DS_EXPAND  2048
  
+ #define CU_NO_TWIST           4096
  /* spacemode */
  #define CU_LEFT                       0
  #define CU_MIDDLE             1