[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41850] trunk/blender/source/blender: remove unused OceanModifierData member & use smaller flags where possible

[Campbell Barton]

Revision: 41850
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41850
Author:   campbellbarton
Date:     2011-11-15 03:48:25 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
remove unused OceanModifierData member & use smaller flags where possible

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/modifiers/intern/MOD_ocean.c

Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h  2011-11-15 
02:58:06 UTC (rev 41849)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h  2011-11-15 
03:48:25 UTC (rev 41850)
@@ -751,7 +751,7 @@
 // #define MOD_SCREW_OBJECT_ANGLE      (1<<4)
 
 typedef struct OceanModifierData {
-       ModifierData modifier;          
+       ModifierData modifier;
        
        struct Ocean *ocean;
        struct OceanCache *oceancache;
@@ -773,25 +773,27 @@
        float   foam_coverage;
        float   time;
        
-       int             seed;
-       int             flag;
-       int             output;
-       
-       int             refresh;
-       
        int             bakestart;
        int             bakeend;
        
        char    cachepath[240]; // FILE_MAX
-       int             cached;
-       
-       int             geometry_mode;
+       char    cached;
+       char    geometry_mode;
+
+       char    flag;
+       char    refresh;
+
+       short   repeat_x;
+       short   repeat_y;
+
+       int             seed;
+
        float   size;
-       int             repeat_x;
-       int             repeat_y;
        
        float   foam_fade;
-       
+
+       int pad;
+
 } OceanModifierData;
 
 #define MOD_OCEAN_GEOM_GENERATE        0

Modified: trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_ocean.c   2011-11-15 
02:58:06 UTC (rev 41849)
+++ trunk/blender/source/blender/modifiers/intern/MOD_ocean.c   2011-11-15 
03:48:25 UTC (rev 41850)
@@ -178,7 +178,6 @@
 
        tomd->seed = omd->seed;
        tomd->flag = omd->flag;
-       tomd->output = omd->output;
 
        tomd->refresh = 0;
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs