Revision: 17701
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17701
Author: blendix
Date: 2008-12-03 21:17:12 +0100 (Wed, 03 Dec 2008)
Log Message:
-----------
RNA
* Added a function to define booleans negative, to turn negative
properties into positive ones gettin rid of the no_ prefix, and
also got rid of the use_ prefix for two booleans.
* Also made the function for enum bitflags separate, this is quite
rare so don't need to bother with this in most cases.
* Removed svn:executable flags from some files.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ipo.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lattice.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_mesh.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sensor.c
Property Changed:
----------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_vfont.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-03 19:33:42 UTC (rev 17700)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-03 20:17:12 UTC (rev 17701)
@@ -205,15 +205,15 @@
rna_print_data_get(f, dp);
if(dp->dnaarraylength == 1) {
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit)
- fprintf(f, " return
((data->%s & (%d<<index)) != 0);\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " return
(%s(data->%s & (%d<<index)) != 0);\n", (dp->booleannegative)? "!": "",
dp->dnaname, dp->booleanbit);
else
- fprintf(f, " return
(%s)((&data->%s)[index]);\n", rna_type_type(prop), dp->dnaname);
+ fprintf(f, " return
(%s)%s((&data->%s)[index]);\n", rna_type_type(prop), (dp->booleannegative)?
"!": "", dp->dnaname);
}
else {
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit)
- fprintf(f, " return
((data->%s[index] & %d) != 0);\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " return
(%s(data->%s[index] & %d) != 0);\n", (dp->booleannegative)? "!": "",
dp->dnaname, dp->booleanbit);
else
- fprintf(f, " return
(%s)(data->%s[index]);\n", rna_type_type(prop), dp->dnaname);
+ fprintf(f, " return
(%s)%s(data->%s[index]);\n", rna_type_type(prop), (dp->booleannegative)? "!":
"", dp->dnaname);
}
fprintf(f, "}\n\n");
}
@@ -222,13 +222,13 @@
fprintf(f, "{\n");
rna_print_data_get(f, dp);
if(prop->type == PROP_BOOLEAN && dp->booleanbit)
- fprintf(f, " return (((data->%s) &
%d) != 0);\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " return (%s((data->%s) &
%d) != 0);\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
else if(prop->type == PROP_ENUM &&
dp->enumbitflags)
fprintf(f, " return ((data->%s) &
%d);\n", dp->dnaname, rna_enum_bitmask(prop));
else if(prop->type == PROP_POINTER &&
dp->dnapointerlevel == 0)
fprintf(f, " return
(%s)&(data->%s);\n", rna_type_type(prop), dp->dnaname);
else
- fprintf(f, " return
(%s)(data->%s);\n", rna_type_type(prop), dp->dnaname);
+ fprintf(f, " return
(%s)%s(data->%s);\n", rna_type_type(prop), (dp->booleannegative)? "!": "",
dp->dnaname);
fprintf(f, "}\n\n");
}
break;
@@ -313,22 +313,22 @@
rna_print_data_get(f, dp);
if(dp->dnaarraylength == 1) {
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit) {
- fprintf(f, " if(value)
data->%s |= (%d<<index);\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " if(%svalue)
data->%s |= (%d<<index);\n", (dp->booleannegative)? "!": "", dp->dnaname,
dp->booleanbit);
fprintf(f, " else data->%s
&= ~(%d<<index);\n", dp->dnaname, dp->booleanbit);
}
else {
rna_clamp_value(f, prop);
- fprintf(f, "
(&data->%s)[index]= value;\n", dp->dnaname);
+ fprintf(f, "
(&data->%s)[index]= %svalue;\n", dp->dnaname, (dp->booleannegative)? "!": "");
}
}
else {
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit) {
- fprintf(f, " if(value)
data->%s[index] |= %d;\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " if(%svalue)
data->%s[index] |= %d;\n", (dp->booleannegative)? "!": "", dp->dnaname,
dp->booleanbit);
fprintf(f, " else
data->%s[index] &= ~%d;\n", dp->dnaname, dp->booleanbit);
}
else {
rna_clamp_value(f, prop);
- fprintf(f, "
data->%s[index]= value;\n", dp->dnaname);
+ fprintf(f, "
data->%s[index]= %svalue;\n", dp->dnaname, (dp->booleannegative)? "!": "");
}
}
fprintf(f, "}\n\n");
@@ -338,7 +338,7 @@
fprintf(f, "{\n");
rna_print_data_get(f, dp);
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit) {
- fprintf(f, " if(value) data->%s |=
%d;\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, " if(%svalue) data->%s |=
%d;\n", (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
fprintf(f, " else data->%s &=
~%d;\n", dp->dnaname, dp->booleanbit);
}
else if(prop->type == PROP_ENUM &&
dp->enumbitflags) {
@@ -347,7 +347,7 @@
}
else {
rna_clamp_value(f, prop);
- fprintf(f, " data->%s= value;\n",
dp->dnaname);
+ fprintf(f, " data->%s= %svalue;\n",
dp->dnaname, (dp->booleannegative)? "!": "");
}
fprintf(f, "}\n\n");
}
Property changes on:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
___________________________________________________________________
Name: svn:executable
- *
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2008-12-03 19:33:42 UTC (rev 17700)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
2008-12-03 20:17:12 UTC (rev 17701)
@@ -43,6 +43,10 @@
{CAM_PERSP, "PERSP", "Perspective", ""},
{CAM_ORTHO, "ORTHO", "Orthographic", ""},
{0, NULL, NULL, NULL}};
+ static EnumPropertyItem prop_lens_unit_items[] = {
+ {0, "MILLIMETERS", "Millimeters", ""},
+ {CAM_ANGLETOGGLE, "DEGREES", "Degrees", ""},
+ {0, NULL, NULL, NULL}};
srna= RNA_def_struct(brna, "Camera", "ID", "Camera");
@@ -124,11 +128,12 @@
RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_SHOWNAME);
RNA_def_property_ui_text(prop, "Show Name", "Draw the active Camera's
name in Camera view.");
- prop= RNA_def_property(srna, "use_degrees", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_ANGLETOGGLE);
- RNA_def_property_ui_text(prop, "Use Degrees", "Use degrees instead of
mm as the unit of the Camera lens.");
+ prop= RNA_def_property(srna, "lens_unit", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+ RNA_def_property_enum_items(prop, prop_lens_unit_items);
+ RNA_def_property_ui_text(prop, "Lens Unit", "Unit to edit lens in for
the user interface.");
- /* Pointers */
+ /* pointers */
rna_def_ipo_common(srna);
prop= RNA_def_property(srna, "dof_object", PROP_POINTER, PROP_NONE);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
2008-12-03 19:33:42 UTC (rev 17700)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
2008-12-03 20:17:12 UTC (rev 17701)
@@ -53,7 +53,7 @@
rna_iterator_array_begin(iter, cumap->cm, sizeof(CurveMap),
rna_CurveMapping_curves_length(ptr), NULL);
}
-static void rna_CurveMapping_use_clipping_set(PointerRNA *ptr, int value)
+static void rna_CurveMapping_clip_set(PointerRNA *ptr, int value)
{
CurveMapping *cumap= (CurveMapping*)ptr->data;
@@ -132,7 +132,7 @@
RNA_def_property_ui_text(prop, "Location", "");
prop= RNA_def_property(srna, "handle_type", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_sdna(prop, NULL, "flag", PROP_DEF_ENUM_BITFLAGS);
+ RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_handle_type_items);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_ui_text(prop, "Handle Type", "");
@@ -157,7 +157,7 @@
/* not editable for now, need to have CurveMapping to do
curvemapping_changed */
prop= RNA_def_property(srna, "extend", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_sdna(prop, NULL, "flag", CUMA_EXTEND_EXTRAPOLATE);
+ RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_extend_items);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_ui_text(prop, "Extend", "");
@@ -175,10 +175,10 @@
srna= RNA_def_struct(brna, "CurveMapping", NULL, "CurveMapping");
- prop= RNA_def_property(srna, "use_clipping", PROP_BOOLEAN, PROP_NONE);
+ prop= RNA_def_property(srna, "clip", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", CUMA_DO_CLIP);
- RNA_def_property_ui_text(prop, "Use Clipping", "");
- RNA_def_property_boolean_funcs(prop, NULL,
"rna_CurveMapping_use_clipping_set");
+ RNA_def_property_ui_text(prop, "Clip", "");
+ RNA_def_property_boolean_funcs(prop, NULL, "rna_CurveMapping_clip_set");
prop= RNA_def_property(srna, "clip_min_x", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "clipr.xmin");
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
2008-12-03 19:33:42 UTC (rev 17700)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
2008-12-03 20:17:12 UTC (rev 17701)
@@ -166,9 +166,9 @@
RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO);
RNA_def_property_ui_text(prop, "UV Orco", "Forces to use UV coordinates
for texture mapping 'orco'.");
- prop= RNA_def_property(srna, "no_puno_flip", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_NOPUNOFLIP);
- RNA_def_property_ui_text(prop, "No Puno Flip", "Don't flip vertex
normals while rendering.");
+ prop= RNA_def_property(srna, "vertex_normal_flip", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
CU_NOPUNOFLIP);
+ RNA_def_property_ui_text(prop, "Vertex Normal Flip", "Flip vertex
normals towards the camera during render");
}
static void rna_def_font(BlenderRNA *brna, StructRNA *srna)
Property changes on:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
___________________________________________________________________
Name: svn:executable
- *
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2008-12-03 19:33:42 UTC (rev 17700)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2008-12-03 20:17:12 UTC (rev 17701)
@@ -592,7 +592,7 @@
}
case PROP_ENUM:
DefRNA.silent= 1;
- RNA_def_property_enum_sdna(prop, NULL,
identifier, 0);
+ RNA_def_property_enum_sdna(prop, NULL,
identifier);
DefRNA.silent= 0;
break;
case PROP_POINTER:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
