The revised patch from Leon for new particle effects.

New is that objects can have a force field, and Meshes can even deflect
(collide) particles. This is in a new sub-menu in Object buttons F7

The full instructions where on the web, Leon mailed it me and I will put
it in CMS tomorrow. For those who like to play with it now, here are demo
files:

http://download.blender.org/demo/test/

Quite some changes where in the integration though... so previous created
particle deflectors will not work. Changes to mention now are:
- gravity is renamed to 'force field'
- force field and deflector options are in Object now, not in Mesh
- the options also have its own struct, doesnt add to Object by default
- force fields are possible for all object types, but only work on center.
  So empty objects are typical for it.

Work to do:
- add draw method in 3d win to denote forcefield objects
- check on the UI (panel with different size?)
- add 'recalc' button in deflector panel

6 files changed, 39 insertions, 21 deletions

diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h
index 9023a88310a..dcac971a85b 100644
--- a/source/blender/include/BIF_butspace.h
+++ b/source/blender/include/BIF_butspace.h
@@ -57,6 +57,7 @@ extern void redraw_test_buttons(struct Base *new);
 #define BUTS_SCRIPT			11
 #define BUTS_SOUND			12
 #define BUTS_CONSTRAINT		13
+#define BUTS_EFFECTS		14
 
 /* warning: the values of these defines are used in sbuts->tabs[7] */
 /* buts->mainb new */
@@ -80,6 +81,9 @@ extern void redraw_test_buttons(struct Base *new);
 #define TAB_SHADING_WORLD	3
 #define TAB_SHADING_LAMP	4
 
+#define TAB_OBJECT_OBJECT   0
+#define TAB_OBJECT_EFFECTS  1
+
 /* buts->scaflag */		
 #define BUTS_SENS_SEL		1
 #define BUTS_SENS_ACT		2
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index b098ee51134..6bce7e4e3f1 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -26,7 +26,7 @@
  * The Original Code is: all of this file.
  *
  * Contributor(s): none yet.
- *
+ * 
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
@@ -60,7 +60,7 @@ typedef enum {
 	ICON_ORTHO,
 	ICON_PERSP,
 	ICON_CAMERA,
-	ICON_BLANK1,
+	ICON_EFFECTS,
 	ICON_BBOX,
 	ICON_WIRE,
 	ICON_SOLID,
@@ -89,7 +89,7 @@ typedef enum {
 	ICON_POSE_HLT,
 	ICON_BORDERMOVE,
 	ICON_MAYBE_ITS_A_LASSO,
-	ICON_BLANK6,
+	ICON_BLANK1,
 	ICON_ROTATE,
 	ICON_CURSOR,
 	ICON_ROTATECOLLECTION,
@@ -101,6 +101,8 @@ typedef enum {
 	ICON_BLANK11,
 	ICON_BLANK12,
 	
+
+
 	ICON_DOTSUP,
 	ICON_DOTSDOWN,
 	ICON_MENU_PANEL,
diff --git a/source/blender/include/BSE_editipo_types.h b/source/blender/include/BSE_editipo_types.h
index 8ee67638e7c..c5cb40d9e1c 100644
--- a/source/blender/include/BSE_editipo_types.h
+++ b/source/blender/include/BSE_editipo_types.h
@@ -66,7 +66,7 @@ typedef struct EditIpo {
 
 /* ******************** */
 
-#define OB_TOTIPO	24
+#define OB_TOTIPO	29
 
 #define OB_LOC_X	1
 #define OB_LOC_Y	2
@@ -102,6 +102,11 @@ typedef struct EditIpo {
 #define OB_COL_B	23
 #define OB_COL_A	24
 
+#define OB_PD_GRAV	25
+#define OB_PD_GFALL	26
+#define OB_PD_SDAMP	27
+#define OB_PD_RDAMP	28
+#define OB_PD_PERM	29
 
 
 /* ******************** */
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index b7b04017c2b..f79310317ab 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -63,6 +63,9 @@ extern void object_panels(void);
 extern void do_object_panels(unsigned short event);
 extern void do_constraintbuts(unsigned short event);
 
+/* effects */
+extern void effects_panels(void);
+extern void do_effects_panels(unsigned short event);
 
 /* editing */
 extern void editing_panels(void);
@@ -206,15 +209,6 @@ void butspace_context_switch(SpaceButs *buts, struct Base *new);
 
 #define B_RECALCPATH	1401
 
-#define B_AUTOTIMEOFS	1403
-#define B_FRAMEMAP		1404
-#define B_NEWEFFECT		1405
-#define B_PREVEFFECT	1406
-#define B_NEXTEFFECT	1407
-#define B_CHANGEEFFECT	1408
-#define B_CALCEFFECT	1409
-#define B_DELEFFECT		1410
-#define B_RECALCAL		1411
 
 #define B_PRINTSPEED	1413
 #define B_PRINTLEN		1414
@@ -342,13 +336,6 @@ enum {
 #define B_MAKESTICKY	2082
 #define B_MAKEVERTCOL	2083
 #define B_CHROMADEPTH	2084
-#define B_ISDEFLECTOR   2085
-#define B_PDEFDAMPING   2086
-#define B_GRAVITY       2087
-#define B_GRAVSTRENGTH  2088
-#define B_GRAVPOWER     2089
-#define B_PDEFRDAMP     2090
-#define B_PDEFPERM      2091
 
 /* *********************** */
 #define B_CURVEBUTS		2200
@@ -554,6 +541,20 @@ enum {
 		B_UVAUTO_ALIGNX,
 		B_UVAUTO_ALIGNY		
 };
+
+#define B_EFFECTSBUTS	3500
+
+#define B_AUTOTIMEOFS	3403
+#define B_FRAMEMAP		3404
+#define B_NEWEFFECT		3405
+#define B_PREVEFFECT	3406
+#define B_NEXTEFFECT	3407
+#define B_CHANGEEFFECT	3408
+#define B_CALCEFFECT	3409
+#define B_DELEFFECT		3410
+#define B_RECALCAL		3411
+#define B_RECALC_DEFL	3412
+
 /* *********************** */
 
 /* *********************** */
diff --git a/source/blender/include/ipo.h b/source/blender/include/ipo.h
index 764377170d9..6ae9b68d0a3 100644
--- a/source/blender/include/ipo.h
+++ b/source/blender/include/ipo.h
@@ -65,7 +65,7 @@ typedef struct EditIpo {
 
 /* ******************** */
 
-#define OB_TOTIPO	24
+#define OB_TOTIPO	29
 
 #define OB_LOC_X	1
 #define OB_LOC_Y	2
@@ -101,6 +101,11 @@ typedef struct EditIpo {
 #define OB_COL_B	23
 #define OB_COL_A	24
 
+#define OB_PD_GRAV	25
+#define OB_PD_GFALL	26
+#define OB_PD_SDAMP	27
+#define OB_PD_RDAMP	28
+#define OB_PD_PERM	29
 
 
 /* ******************** */
diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h
index 6b8c2d305a0..a246fe2b8ab 100644
--- a/source/blender/include/mydevice.h
+++ b/source/blender/include/mydevice.h
@@ -218,6 +218,7 @@
 #define REDRAWBUTSLOGIC		0x401B
 #define REDRAWBUTSSHADING	0x401C
 #define REDRAWBUTSGAME		0x401D
+#define REDRAWBUTSEFFECTS	0x401D
 
 #define REDRAWINFO			0x4021
 #define RENDERPREVIEW		0x4022