diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 10 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh_api.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space_api.c | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 5fc65ea385c..357490924f2 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -72,7 +72,7 @@ static void rna_Image_save_render(Image *image, bContext *C, ReportList *reports } if (scene) { - ImageUser iuser = {0}; + ImageUser iuser = {NULL}; void *lock; iuser.scene = scene; diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 81c26af189d..c915acdeeac 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -94,7 +94,7 @@ static int rna_use_shadow_get(PointerRNA *ptr) Lamp *la = (Lamp *)ptr->data; if (la->type == LA_SPOT) { - return (la->mode & LA_SHAD_BUF) != 0; + return (la->mode & (LA_SHAD_BUF | LA_SHAD_RAY)) != 0; } else { return (la->mode & LA_SHAD_RAY) != 0; @@ -104,14 +104,10 @@ static int rna_use_shadow_get(PointerRNA *ptr) static void rna_use_shadow_set(PointerRNA *ptr, int value) { Lamp *la = (Lamp *)ptr->data; + la->mode &= ~(LA_SHAD_BUF | LA_SHAD_RAY); if (value) { - if (la->type == LA_SPOT) - la->mode |= LA_SHAD_BUF; - else - la->mode |= LA_SHAD_RAY; + la->mode |= LA_SHAD_RAY; } - else - la->mode &= ~(LA_SHAD_BUF | LA_SHAD_RAY); } static StructRNA *rna_Lamp_refine(struct PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index a994bf5e9d1..abf29ef82a3 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -279,7 +279,7 @@ void RNA_api_mesh(StructRNA *srna) RNA_def_boolean(func, "free_mpoly", 0, "Free MPoly", "Free data used by polygons and loops. " "WARNING: This destructive operation removes regular faces, " "only used on temporary mesh data-blocks to reduce memory footprint of render " - "engines and export scripts."); + "engines and export scripts"); func = RNA_def_function(srna, "calc_smooth_groups", "rna_Mesh_calc_smooth_groups"); RNA_def_function_ui_description(func, "Calculate smooth groups from sharp edges"); diff --git a/source/blender/makesrna/intern/rna_space_api.c b/source/blender/makesrna/intern/rna_space_api.c index 4114ee8a289..3cfbd798ad6 100644 --- a/source/blender/makesrna/intern/rna_space_api.c +++ b/source/blender/makesrna/intern/rna_space_api.c @@ -101,7 +101,7 @@ void RNA_api_space_text(StructRNA *srna) RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_int(func, "column", 0, INT_MIN, INT_MAX, "Column", "Column index", 0, INT_MAX); RNA_def_property_flag(parm, PROP_REQUIRED); - parm = RNA_def_int_array(func, "result", 2, 0, -1, INT_MAX, "", "Region coordinates", -1, INT_MAX); + parm = RNA_def_int_array(func, "result", 2, NULL, -1, INT_MAX, "", "Region coordinates", -1, INT_MAX); RNA_def_function_output(func, parm); } |