diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
commit | 5c891386842037910f5d522c7d3ffb1792b804db (patch) | |
tree | 133e551d3bf684ea1ccaa8a7d56a4f57b879a95a /source/blender/makesrna | |
parent | 69d0a68f0d7ed82b9701c5a7832f609e4ea4fd75 (diff) |
style cleanup: comments
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 28 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 9 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_key.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 7 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_meta.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 11 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 5 |
13 files changed, 52 insertions, 49 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index c24b78a155c..e564c03df14 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -322,7 +322,7 @@ static void rna_ConstraintActuator_spring_set(struct PointerRNA *ptr, float valu *fp = value; } /* ConstraintActuator uses the same property for Material and Property. - Therefore we need to clear the property when "use_material_detect" mode changes */ + * Therefore we need to clear the property when "use_material_detect" mode changes */ static void rna_Actuator_constraint_detect_material_set(struct PointerRNA *ptr, int value) { bActuator *act = (bActuator*)ptr->data; @@ -1453,19 +1453,19 @@ static void rna_def_scene_actuator(BlenderRNA *brna) RNA_def_property_update(prop, NC_LOGIC, NULL); /* XXX no need for those tooltips. to remove soon - Originally we had different 'scene' tooltips for different values of 'type'. - They were: - ACT_SCENE_RESTART "" - ACT_SCENE_CAMERA "" - ACT_SCENE_SET "Set this Scene" - ACT_SCENE_ADD_FRONT "Add an Overlay Scene" - ACT_SCENE_ADD_BACK "Add a Background Scene" - ACT_SCENE_REMOVE "Remove a Scene" - ACT_SCENE_SUSPEND "Pause a Scene" - ACT_SCENE_RESUME "Unpause a Scene" - - It can be done in the ui script if still needed. - */ + * Originally we had different 'scene' tooltips for different values of 'type'. + * They were: + * ACT_SCENE_RESTART "" + * ACT_SCENE_CAMERA "" + * ACT_SCENE_SET "Set this Scene" + * ACT_SCENE_ADD_FRONT "Add an Overlay Scene" + * ACT_SCENE_ADD_BACK "Add a Background Scene" + * ACT_SCENE_REMOVE "Remove a Scene" + * ACT_SCENE_SUSPEND "Pause a Scene" + * ACT_SCENE_RESUME "Unpause a Scene" + * + * It can be done in the ui script if still needed. + */ } diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 0b80f4ab893..5093c1a6eee 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -927,7 +927,7 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Is Stroke Start", ""); /* XXX: Tool (this will be for pressing a modifier key for a different brush, - e.g. switching to a Smooth brush in the middle of the stroke */ + * e.g. switching to a Smooth brush in the middle of the stroke */ /* XXX: i don't think blender currently supports the ability to properly do a remappable modifier * in the middle of a stroke */ diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 128c2609df9..5bf52c0d552 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1200,13 +1200,13 @@ static void rna_def_curve_spline_bezpoints(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_flag(func, FUNC_USE_SELF_ID|FUNC_USE_REPORTS); RNA_def_int(func, "count", 1, INT_MIN, INT_MAX, "Number", "Number of points to add to the spline", 0, INT_MAX); - /* +#if 0 func= RNA_def_function(srna, "remove", "rna_Curve_spline_remove"); RNA_def_function_ui_description(func, "Remove a spline from a curve"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm= RNA_def_pointer(func, "spline", "Spline", "", "The spline to remove"); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); - */ +#endif } /* curve.splines */ @@ -1449,13 +1449,14 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_Curve_texspace_size_get", "rna_Curve_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - /* not supported yet + /* not supported yet */ +#if 0 prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); RNA_def_property_float(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation"); RNA_def_property_editable_func(prop, texspace_editable); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - */ +#endif prop = RNA_def_property(srna, "use_uv_as_generated", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 792635ba5ae..e5939296f5a 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -189,11 +189,11 @@ static void rna_Image_file_format_set(PointerRNA *ptr, int value) ImBuf *ibuf; int ftype = BKE_imtype_to_ftype(value); - /* +#if 0 ibuf= BKE_image_get_ibuf(image, NULL); if (ibuf) ibuf->ftype= ftype; - */ +#endif /* to be safe change all buffer file types */ for (ibuf = image->ibufs.first; ibuf; ibuf = ibuf->next) { @@ -603,9 +603,9 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); /* - Image.has_data and Image.depth are temporary, - Update import_obj.py when they are replaced (Arystan) - */ + * Image.has_data and Image.depth are temporary, + * Update import_obj.py when they are replaced (Arystan) + */ prop = RNA_def_property(srna, "has_data", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_Image_has_data_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 245346326ae..94120c8edc6 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -267,7 +267,8 @@ static void rna_ShapeKeyBezierPoint_handle_2_co_set(PointerRNA *ptr, const float vec[6+2] = values[2]; } -/*static float rna_ShapeKeyBezierPoint_tilt_get(PointerRNA *ptr) +#if 0 +static float rna_ShapeKeyBezierPoint_tilt_get(PointerRNA *ptr) { float *vec= (float*)ptr->data; return vec[10]; @@ -277,7 +278,8 @@ static void rna_ShapeKeyBezierPoint_tilt_set(PointerRNA *ptr, float value) { float *vec= (float*)ptr->data; vec[10]= value; -}*/ +} +#endif static void rna_ShapeKey_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 92e65f26100..a0d3cdef9eb 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -606,21 +606,18 @@ static int rna_Main_gpencil_is_updated_get(PointerRNA *ptr) { return DAG_id_type void RNA_api_main(StructRNA *srna) { - /* +#if 0 FunctionRNA *func; PropertyRNA *parm; - */ /* maybe we want to add functions in 'bpy.data' still? * for now they are all in collections bpy.data.images.new(...) */ - /* func= RNA_def_function(srna, "add_image", "rna_Main_add_image"); RNA_def_function_ui_description(func, "Add a new image"); parm= RNA_def_string_file_path(func, "filepath", "", 0, "", "File path to load image from"); RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_pointer(func, "image", "Image", "", "New image"); RNA_def_function_return(func, parm); - */ - +#endif } void RNA_def_main_cameras(BlenderRNA *brna, PropertyRNA *cprop) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index d6c240b29c1..78f62194735 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1,4 +1,4 @@ -/** +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -20,9 +20,9 @@ * ***** END GPL LICENSE BLOCK ***** */ -/*note: the original vertex color stuff is now just used for - getting info on the layers themselves, accessing the data is - done through the (not yet written) mpoly interfaces.*/ +/* note: the original vertex color stuff is now just used for + * getting info on the layers themselves, accessing the data is + * done through the (not yet written) mpoly interfaces.*/ /** \file blender/makesrna/intern/rna_mesh.c * \ingroup RNA diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 5fb432c9e8f..e8ea19a5c5b 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -331,13 +331,14 @@ static void rna_def_metaball(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_Meta_texspace_size_get", "rna_Meta_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - /* not supported yet + /* not supported yet */ +#if 0 prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); RNA_def_property_float(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation"); RNA_def_property_editable_func(prop, "rna_Meta_texspace_editable"); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - */ +#endif /* materials */ prop = RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index f5bded42a1c..a101bcaec12 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1711,14 +1711,14 @@ static void def_cmp_image(StructRNA *srna) { PropertyRNA *prop; - /* - static EnumPropertyItem type_items[] = { +#if 0 + static EnumPropertyItem type_items[] = { {IMA_SRC_FILE, "IMAGE", 0, "Image", ""}, {IMA_SRC_MOVIE, "MOVIE", "Movie", ""}, {IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", ""}, {IMA_SRC_GENERATED, "GENERATED", "Generated", ""}, {0, NULL, 0, NULL, NULL}}; - */ +#endif prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "id"); @@ -2873,13 +2873,14 @@ static void def_tex_image(StructRNA *srna) RNA_def_property_ui_text(prop, "Image", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - /* is this supposed to be exposed? not sure.. + /* is this supposed to be exposed? not sure.. */ +#if 0 prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "storage"); RNA_def_property_struct_type(prop, "ImageUser"); RNA_def_property_ui_text(prop, "Settings", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - */ +#endif } static void def_tex_bricks(StructRNA *srna) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 410756ff5ea..d2eef1cdd43 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1780,7 +1780,7 @@ static void rna_def_unified_paint_settings(BlenderRNA *brna) "Instead of per-brush strength, the strength is shared across brushes"); /* unified paint settings that override the equivalent settings - from the active brush */ + * from the active brush */ prop = RNA_def_property(srna, "size", PROP_INT, PROP_DISTANCE); RNA_def_property_int_funcs(prop, NULL, "rna_UnifiedPaintSettings_size_set", NULL); RNA_def_property_range(prop, 1, MAX_BRUSH_PIXEL_RADIUS*10); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 26dfe3c9a4f..fab80997d08 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1237,8 +1237,8 @@ static void rna_def_texture_image(BlenderRNA *brna) #if 0 /* XXX: did this as an array, but needs better descriptions than "1 2 3 4" - perhaps a new subtype could be added? - --I actually used single values for this, maybe change later with a RNA_Rect thing? */ + * perhaps a new subtype could be added? + * --I actually used single values for this, maybe change later with a RNA_Rect thing? */ prop = RNA_def_property(srna, "crop_rectangle", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "cropxmin"); RNA_def_property_array(prop, 4); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 8d331670135..c3a46c39643 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -168,8 +168,8 @@ void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value) BLI_strncpy(track->name, value, sizeof(track->name)); /* TODO: it's a bit difficult to find list track came from knowing just - movie clip ID and MovieTracking structure, so keep this naive - search for a while */ + * movie clip ID and MovieTracking structure, so keep this naive + * search for a while */ if (BLI_findindex(tracksbase, track) < 0) { MovieTrackingObject *object = tracking->objects.first; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index e65f59144af..2b62b459b6e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -482,14 +482,15 @@ static void rna_def_userdef_theme_ui_style(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Panel Style", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); -/* (not used yet) + /* (not used yet) */ +#if 0 prop= RNA_def_property(srna, "group_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "grouplabel"); RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Group Label Font", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); -*/ +#endif prop = RNA_def_property(srna, "widget_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "widgetlabel"); |