Revision: 16353
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16353
Author: genscher
Date: 2008-09-03 18:10:20 +0200 (Wed, 03 Sep 2008)
Log Message:
-----------
Clean up merging conflict
Modified Paths:
--------------
branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h
Modified: branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h
2008-09-03 16:02:40 UTC (rev 16352)
+++ branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h
2008-09-03 16:10:20 UTC (rev 16353)
@@ -35,11 +35,8 @@
eModifierType_Cloth,
eModifierType_Collision,
eModifierType_Bevel,
-<<<<<<< .working
eModifierType_Fluidsim,
-=======
eModifierType_Shrinkwrap,
->>>>>>> .merge-rechts.r16222
NUM_MODIFIER_TYPES
} ModifierType;
@@ -496,7 +493,6 @@
float protect;
} ExplodeModifierData;
-<<<<<<< .working
typedef struct FluidsimModifierData {
ModifierData modifier;
@@ -504,7 +500,6 @@
struct PointCache *point_cache; /* definition is in DNA_object_force.h
*/
} FluidsimModifierData;
-=======
typedef struct ShrinkwrapModifierData {
ModifierData modifier;
@@ -546,5 +541,4 @@
#define MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS (1<<2)
#define MOD_SHRINKWRAP_PROJECT_OVER_NORMAL 0 /*
projection over normal is used if no axis is selected */
->>>>>>> .merge-rechts.r16222
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
