From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 21 Sep 2008 13:03:39 +0000 (+0000)
Subject: svn merge -r 16593:16648 https://svn.blender.org/svnroot/bf-blender/trunk/blender
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/commitdiff_plain/518b8fe01834b6379614f65f7c611645e5ad4bd5

svn merge -r 16593:16648 https://svn.blender.org/svnroot/bf-blender/trunk/blender
---

518b8fe01834b6379614f65f7c611645e5ad4bd5
diff --cc source/blender/makesdna/DNA_ipo_types.h
index f517bf14733,fe75148fb3b..5be6dd727c0
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@@ -330,22 -370,11 +370,11 @@@ typedef struct Ipo 
  
  #define CO_ENFORCE	1
  #define CO_HEADTAIL	2
- /*
- #define	CO_TIME		2
- #define CO_OFFSET_X	3
- #define CO_OFFSET_Y	4
- #define CO_OFFSET_Z	5
- #define CO_ORIENT_X	6
- #define CO_ORIENT_Y	7
- #define CO_ORIENT_Z	8
- #define CO_ROLL		9
- */
  
- /* ******************** */
- /* fluidsim ipos NT */
+ /* ****** FluidSim (ID_FLUIDSIM) ****** */
  
 -#define FLUIDSIM_TOTIPO	9
 -#define FLUIDSIM_TOTNAM	9
 +#define FLUIDSIM_TOTIPO	13
 +#define FLUIDSIM_TOTNAM	13
  
  #define FLUIDSIM_VISC   1
  #define FLUIDSIM_TIME   2
@@@ -360,13 -389,8 +389,15 @@@
  
  #define FLUIDSIM_ACTIVE 9
  
 -/* ******* Particle (ID_PA) ******** */
 +#define FLUIDSIM_ATTR_FORCE_STR 	10
 +#define FLUIDSIM_ATTR_FORCE_RADIUS 	11
 +#define FLUIDSIM_VEL_FORCE_STR 		12
 +#define FLUIDSIM_VEL_FORCE_RADIUS 	13
 +
 +/* ******************** */
 +/* particle ipos */
+ 
++/* ******* Particle (ID_PA) ******** */
  #define PART_TOTIPO		25
  #define PART_TOTNAM		25