diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_dynamicpaint.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 14 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_key.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 22 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 10 |
8 files changed, 36 insertions, 34 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 4b58e13d994..a47426861b1 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -49,8 +49,8 @@ /** * Variable to control debug output of makesrna. * debugSRNA: - * - 0 = no output, except errors - * - 1 = detail actions + * - 0 = no output, except errors + * - 1 = detail actions */ static int debugSRNA = 0; diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index aa1164068d8..2dac5439c80 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -222,7 +222,7 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr) int index; /* helper macro for use here to try and get the path - * - this calls the standard code for getting a path to a texture... + * - this calls the standard code for getting a path to a texture... */ #define COLRAMP_GETPATH \ diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index c82c95e5a4b..42f8e2ae787 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -93,7 +93,7 @@ static char *rna_DynamicPaintSurface_path(PointerRNA *ptr) /* - * Surfaces + * Surfaces */ static void rna_DynamicPaint_redoModifier(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) @@ -510,7 +510,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaint_redoModifier"); /* - * Initial Color + * Initial Color */ prop = RNA_def_property(srna, "init_color_type", PROP_ENUM, PROP_NONE); @@ -535,7 +535,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna) RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_DRAW | ND_MODIFIER, "rna_DynamicPaintSurface_reset"); /* - * Effect Settings + * Effect Settings */ prop = RNA_def_property(srna, "effect_ui", PROP_ENUM, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); @@ -755,7 +755,7 @@ static void rna_def_dynamic_paint_canvas_settings(BlenderRNA *brna) RNA_def_struct_path_func(srna, "rna_DynamicPaintCanvasSettings_path"); /* - * Surface Slots + * Surface Slots */ prop = RNA_def_property(srna, "canvas_surfaces", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_funcs(prop, "rna_DynamicPaint_surfaces_begin", "rna_iterator_listbase_next", diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 9dbc9a62aa4..92f6bb16340 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -111,8 +111,10 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr) return &RNA_FModifierCycles; case FMODIFIER_TYPE_NOISE: return &RNA_FModifierNoise; - /*case FMODIFIER_TYPE_FILTER: */ - /* return &RNA_FModifierFilter; */ +#if 0 + case FMODIFIER_TYPE_FILTER: + return &RNA_FModifierFilter; +#endif case FMODIFIER_TYPE_PYTHON: return &RNA_FModifierPython; case FMODIFIER_TYPE_LIMITS: @@ -1026,8 +1028,8 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna) RNA_def_struct_sdna(srna, "FCM_EnvelopeData"); /* min/max extents - * - for now, these are allowed to go past each other, so that we can have inverted action - * - technically, the range is limited by the settings in the envelope-modifier data, not here... + * - for now, these are allowed to go past each other, so that we can have inverted action + * - technically, the range is limited by the settings in the envelope-modifier data, not here... */ prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min"); @@ -1046,7 +1048,7 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, "rna_FModifier_update"); /* TODO: */ - /* - selection flags (not implemented in UI yet though) */ + /* - selection flags (not implemented in UI yet though) */ } static void rna_def_fmodifier_envelope_control_points(BlenderRNA *brna, PropertyRNA *cprop) @@ -1569,7 +1571,7 @@ static void rna_def_drivervar(BlenderRNA *brna) static void rna_def_channeldriver_variables(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; -/* PropertyRNA *prop; */ + /* PropertyRNA *prop; */ FunctionRNA *func; PropertyRNA *parm; diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 9a22742e7b9..6170c884b51 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -519,7 +519,7 @@ static KeyBlock *rna_ShapeKeyData_find_keyblock(Key *key, float *point) } /* determine where end of array is - * - elemsize is in bytes, so use (char *) cast to get array in terms of bytes + * - elemsize is in bytes, so use (char *) cast to get array in terms of bytes */ end = (float *)((char *)start + (key->elemsize * kb->totelem)); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 09b194d0e1b..d27a9d3740d 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -136,11 +136,11 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value) NlaStrip *data = (NlaStrip *)ptr->data; /* clamp value to lie within valid limits - * - cannot start past the end of the strip + some flexibility threshold - * - cannot start before the previous strip (if present) ends - * -> but if it was a transition, we could go up to the start of the strip + some flexibility threshold - * as long as we re-adjust the transition afterwards - * - minimum frame is -MAXFRAME so that we don't get clipping on frame 0 + * - cannot start past the end of the strip + some flexibility threshold + * - cannot start before the previous strip (if present) ends + * -> but if it was a transition, we could go up to the start of the strip + some flexibility threshold + * as long as we re-adjust the transition afterwards + * - minimum frame is -MAXFRAME so that we don't get clipping on frame 0 */ if (data->prev) { if (data->prev->type == NLASTRIP_TYPE_TRANSITION) { @@ -164,11 +164,11 @@ static void rna_NlaStrip_end_frame_set(PointerRNA *ptr, float value) NlaStrip *data = (NlaStrip *)ptr->data; /* clamp value to lie within valid limits - * - must not have zero or negative length strip, so cannot start before the first frame - * + some minimum-strip-length threshold - * - cannot end later than the start of the next strip (if present) - * -> but if it was a transition, we could go up to the start of the end - some flexibility threshold - * as long as we re-adjust the transition afterwards + * - must not have zero or negative length strip, so cannot start before the first frame + * + some minimum-strip-length threshold + * - cannot end later than the start of the next strip (if present) + * -> but if it was a transition, we could go up to the start of the end - some flexibility threshold + * as long as we re-adjust the transition afterwards */ if (data->next) { if (data->next->type == NLASTRIP_TYPE_TRANSITION) { @@ -390,7 +390,7 @@ static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *repo /* create dummy AnimData block so that BKE_nlastrip_validate_name() * can be used to ensure a valid name, as we don't have one here... - * - only the nla_tracks list is needed there, which we aim to reverse engineer here... + * - only the nla_tracks list is needed there, which we aim to reverse engineer here... */ { AnimData adt = {NULL}; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index d6c45fd69d0..fb7fee06b83 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -916,8 +916,8 @@ static void rna_Scene_active_keying_set_set(PointerRNA *ptr, PointerRNA value) } /* get KeyingSet index stuff for list of Keying Sets editing UI - * - active_keyingset-1 since 0 is reserved for 'none' - * - don't clamp, otherwise can never set builtins types as active... + * - active_keyingset-1 since 0 is reserved for 'none' + * - don't clamp, otherwise can never set builtins types as active... */ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr) { @@ -926,7 +926,7 @@ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr) } /* get KeyingSet index stuff for list of Keying Sets editing UI - * - value+1 since 0 is reserved for 'none' + * - value+1 since 0 is reserved for 'none' */ static void rna_Scene_active_keying_set_index_set(PointerRNA *ptr, int value) { @@ -2894,7 +2894,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING); RNA_def_property_ui_text(prop, "Use Bone Sketching", "Use sketching to create and edit bones"); -/* RNA_def_property_ui_icon(prop, ICON_EDIT, 0); */ + // RNA_def_property_ui_icon(prop, ICON_EDIT, 0); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "use_etch_quick", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index ae1761faec1..987f94c5238 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1362,21 +1362,21 @@ static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *sce if (saction->mode == SACTCONT_SHAPEKEY) { Key *key = BKE_key_from_object(obact); - /* 1) update the action stored for the editor */ + /* 1) update the action stored for the editor */ if (key) saction->action = (key->adt) ? key->adt->action : NULL; else saction->action = NULL; - /* 2) enable 'show sliders' by default, since one of the main - * points of the ShapeKey Editor is to provide a one-stop shop - * for controlling the shapekeys, whose main control is the value + /* 2) enable 'show sliders' by default, since one of the main + * points of the ShapeKey Editor is to provide a one-stop shop + * for controlling the shapekeys, whose main control is the value */ saction->flag |= SACTION_SLIDERS; } /* make sure action stored is valid */ else if (saction->mode == SACTCONT_ACTION) { - /* 1) update the action stored for the editor */ + /* 1) update the action stored for the editor */ /* TODO: context selector could help decide this with more control? */ if (obact) saction->action = (obact->adt) ? obact->adt->action : NULL; |