sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

SpaceImage.curves --> curve for consistency.

Browse Source
This commit is contained in:
Campbell Barton 2011-03-25 04:37:59 +00:00
parent a21f46b6d4
commit 2c04bab116
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_image/image_buttons.c
View File

@ -346,7 +346,7 @@ static void image_panel_curves(const bContext *C, Panel *pa)
levels= (ibuf->channels==4); levels= (ibuf->channels==4);
RNA_pointer_create(&sc->id, &RNA_SpaceImageEditor, sima, &simaptr); 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); ED_space_image_release_buffer(sima, lock);

32
source/blender/makesrna/intern/rna_access.c
View File

@ -62,22 +62,6 @@
#include "rna_internal.h" #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}}; const PointerRNA PointerRNA_NULL= {{NULL}};
/* Init/Exit */ /* Init/Exit */
@ -5093,3 +5077,19 @@ int RNA_property_copy(PointerRNA *ptr, PointerRNA *fromptr, PropertyRNA *prop, i
return 0; 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
}

4
source/blender/makesrna/intern/rna_space.c
View File

@ -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_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); 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_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"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, "rna_SpaceImageEditor_curves_update");
prop= RNA_def_property(srna, "scopes", PROP_POINTER, PROP_NONE); prop= RNA_def_property(srna, "scopes", PROP_POINTER, PROP_NONE);