diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 32 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 8b3ceecc7da..6a50de566ac 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -346,7 +346,7 @@ static void image_panel_curves(const bContext *C, Panel *pa) levels= (ibuf->channels==4); RNA_pointer_create(&sc->id, &RNA_SpaceImageEditor, sima, &simaptr); - uiTemplateCurveMapping(pa->layout, &simaptr, "curves", 'c', levels, 0); + uiTemplateCurveMapping(pa->layout, &simaptr, "curve", 'c', levels, 0); } ED_space_image_release_buffer(sima, lock); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index cbd02d885dc..4d2e205d1a9 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -62,22 +62,6 @@ #include "rna_internal.h" -void RNA_warning(const char *format, ...) -{ - va_list args; - - va_start(args, format); - vprintf(format, args); - va_end(args); - -#if WITH_PYTHON - { - extern void PyC_LineSpit(void); - PyC_LineSpit(); - } -#endif -} - const PointerRNA PointerRNA_NULL= {{NULL}}; /* Init/Exit */ @@ -5093,3 +5077,19 @@ int RNA_property_copy(PointerRNA *ptr, PointerRNA *fromptr, PropertyRNA *prop, i return 0; } + +void RNA_warning(const char *format, ...) +{ + va_list args; + + va_start(args, format); + vprintf(format, args); + va_end(args); + +#ifdef WITH_PYTHON + { + extern void PyC_LineSpit(void); + PyC_LineSpit(); + } +#endif +} diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 54b2dc1dd0f..5d39537970b 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1450,9 +1450,9 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Image User", "Parameters defining which layer, pass and frame of the image is displayed"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "curves", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "curve", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "cumap"); - RNA_def_property_ui_text(prop, "Curves", "Color curve mapping to use for displaying the image"); + RNA_def_property_ui_text(prop, "Curve", "Color curve mapping to use for displaying the image"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, "rna_SpaceImageEditor_curves_update"); prop= RNA_def_property(srna, "scopes", PROP_POINTER, PROP_NONE); |