[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27831] branches/render25/source/blender: copy and initialize uv modifier scale, remove unneeded enum.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 29 12:15:27 CEST 2010
Revision: 27831
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27831
Author: campbellbarton
Date: 2010-03-29 12:15:25 +0200 (Mon, 29 Mar 2010)
Log Message:
-----------
copy and initialize uv modifier scale, remove unneeded enum.
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/editors/object/object_hook.c
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-29 10:09:02 UTC (rev 27830)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-29 10:15:25 UTC (rev 27831)
@@ -3606,6 +3606,7 @@
umd->flags = 0;
umd->num_projectors = 1;
umd->aspectx = umd->aspecty = 1.0f;
+ umd->scalex = umd->scaley = 1.0f;
}
static void uvprojectModifier_copyData(ModifierData *md, ModifierData *target)
@@ -3621,6 +3622,8 @@
tumd->num_projectors = umd->num_projectors;
tumd->aspectx = umd->aspectx;
tumd->aspecty = umd->aspecty;
+ tumd->scalex = umd->scalex;
+ tumd->scaley = umd->scaley;
}
static CustomDataMask uvprojectModifier_requiredDataMask(Object *ob, ModifierData *md)
Modified: branches/render25/source/blender/editors/object/object_hook.c
===================================================================
--- branches/render25/source/blender/editors/object/object_hook.c 2010-03-29 10:09:02 UTC (rev 27830)
+++ branches/render25/source/blender/editors/object/object_hook.c 2010-03-29 10:15:25 UTC (rev 27831)
@@ -529,9 +529,6 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static EnumPropertyItem hook_mod_items[]= {
-{0, NULL, 0, NULL, NULL}};
-
static int object_hook_remove_exec(bContext *C, wmOperator *op)
{
int num= RNA_enum_get(op->ptr, "modifier");
@@ -566,7 +563,7 @@
int a, totitem= 0;
if(!ob)
- return hook_mod_items;
+ return DummyRNA_NULL_items;
for(a=0, md=ob->modifiers.first; md; md= md->next, a++) {
if (md->type==eModifierType_Hook) {
@@ -602,8 +599,8 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "modifier", hook_mod_items, 0, "Modifier", "Modifier number to remove.");
- RNA_def_enum_funcs(prop, hook_mod_itemf);
+ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove.");
+ RNA_def_enum_funcs(prop, DummyRNA_NULL_items);
ot->prop= prop;
}
@@ -669,7 +666,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "modifier", hook_mod_items, 0, "Modifier", "Modifier number to assign to.");
+ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to.");
RNA_def_enum_funcs(prop, hook_mod_itemf);
}
@@ -725,7 +722,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "modifier", hook_mod_items, 0, "Modifier", "Modifier number to assign to.");
+ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to.");
RNA_def_enum_funcs(prop, hook_mod_itemf);
}
@@ -788,7 +785,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "modifier", hook_mod_items, 0, "Modifier", "Modifier number to assign to.");
+ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to assign to.");
RNA_def_enum_funcs(prop, hook_mod_itemf);
}
@@ -837,7 +834,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "modifier", hook_mod_items, 0, "Modifier", "Modifier number to remove.");
+ prop= RNA_def_enum(ot->srna, "modifier", DummyRNA_NULL_items, 0, "Modifier", "Modifier number to remove.");
RNA_def_enum_funcs(prop, hook_mod_itemf);
}
More information about the Bf-blender-cvs
mailing list