[Bf-blender-cvs] [a183aa6] master: error in last commit, flag names.

[Campbell Barton]

Commit: a183aa6c6794a01d4fe633ca6fb732c8d7a61826
Author: Campbell Barton
Date:   Sun Dec 22 07:16:41 2013 +1100
http://developer.blender.org/rBa183aa6c6794a01d4fe633ca6fb732c8d7a61826

error in last commit, flag names.

===================================================================

M       source/blender/makesdna/DNA_modifier_types.h
M       source/blender/makesrna/intern/rna_modifier.c
M       source/blender/modifiers/intern/MOD_wireframe.c

===================================================================

diff --git a/source/blender/makesdna/DNA_modifier_types.h 
b/source/blender/makesdna/DNA_modifier_types.h
index f057333..e9eab54 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1337,9 +1337,9 @@ enum {
        MOD_WIREFRAME_INVERT_VGROUP = (1 << 0),
        MOD_WIREFRAME_REPLACE       = (1 << 1),
        MOD_WIREFRAME_BOUNDARY      = (1 << 2),
-       MOD_MESHCACHE_OFS_EVEN      = (1 << 3),
-       MOD_MESHCACHE_OFS_RELATIVE  = (1 << 4),
-       MOD_MESHCACHE_CREASE        = (1 << 5),
+       MOD_WIREFRAME_OFS_EVEN      = (1 << 3),
+       MOD_WIREFRAME_OFS_RELATIVE  = (1 << 4),
+       MOD_WIREFRAME_CREASE        = (1 << 5),
 };
 
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c 
b/source/blender/makesrna/intern/rna_modifier.c
index 04055bf..84ee2b1 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3753,17 +3753,17 @@ static void rna_def_modifier_wireframe(BlenderRNA *brna)
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_even_offset", PROP_BOOLEAN, 
PROP_NONE);
-       RNA_def_property_boolean_sdna(prop, NULL, "flag", 
MOD_MESHCACHE_OFS_EVEN);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", 
MOD_WIREFRAME_OFS_EVEN);
        RNA_def_property_ui_text(prop, "Offset Even", "Scale the offset to give 
more even thickness");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, 
PROP_NONE);
-       RNA_def_property_boolean_sdna(prop, NULL, "flag", 
MOD_MESHCACHE_OFS_RELATIVE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", 
MOD_WIREFRAME_OFS_RELATIVE);
        RNA_def_property_ui_text(prop, "Offset Relative", "Scale the offset by 
surrounding geometry");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_crease", PROP_BOOLEAN, PROP_NONE);
-       RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MESHCACHE_CREASE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_CREASE);
        RNA_def_property_ui_text(prop, "Offset Relative", "Crease hub edges for 
improved subsurf");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c 
b/source/blender/modifiers/intern/MOD_wireframe.c
index 371c8d6..bcef193 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -45,7 +45,7 @@ static void initData(ModifierData *md)
 {
        WireframeModifierData *wmd = (WireframeModifierData *)md;
        wmd->offset = 0.02f;
-       wmd->flag = MOD_WIREFRAME_REPLACE | MOD_MESHCACHE_OFS_EVEN;
+       wmd->flag = MOD_WIREFRAME_REPLACE | MOD_WIREFRAME_OFS_EVEN;
        wmd->crease_weight = 1.0f;
 }
 
@@ -89,9 +89,9 @@ static DerivedMesh* WireframeModifier_do( 
WireframeModifierData *wmd, Object *ob
               wmd->offset, wmd->offset_fac, wmd->offset_fac_vg,
               (wmd->flag & MOD_WIREFRAME_REPLACE) != 0,
               (wmd->flag & MOD_WIREFRAME_BOUNDARY) != 0,
-              (wmd->flag & MOD_MESHCACHE_OFS_EVEN) != 0,
-              (wmd->flag & MOD_MESHCACHE_OFS_RELATIVE) != 0,
-              (wmd->flag & MOD_MESHCACHE_CREASE) != 0,
+              (wmd->flag & MOD_WIREFRAME_OFS_EVEN) != 0,
+              (wmd->flag & MOD_WIREFRAME_OFS_RELATIVE) != 0,
+              (wmd->flag & MOD_WIREFRAME_CREASE) != 0,
               wmd->crease_weight,
               defgrp_index,
               (wmd->flag & MOD_WIREFRAME_INVERT_VGROUP) != 0,

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