diff options
| author | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-09-19 19:36:30 +0400 |
|---|---|---|
| committer | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-09-19 19:36:30 +0400 |
| commit | 2cbf475fb2c3c020029e1704c8e6cee04a267323 (patch) | |
| tree | 5b09e590e1f6b0736cf5e7ec73d905f04c90a72a /source/blender/editors/render/render_shading.c | |
| parent | 94016ed285c351605057929139caf9b636b179b6 (diff) | |
| parent | d78231734d6ccf224738ea76307c26f8c0d4dab4 (diff) | |
Merged 40338-40364soc-2011-radish
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 6a1eea92563..72cc4ec2afa 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -130,7 +130,7 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op) /* Removing material slots in edit mode screws things up, see bug #21822.*/ if(ob == CTX_data_edit_object(C)) { - BKE_report(op->reports, RPT_ERROR, "Unable to remove material slot in edit mode."); + BKE_report(op->reports, RPT_ERROR, "Unable to remove material slot in edit mode"); return OPERATOR_CANCELLED; } @@ -756,7 +756,7 @@ void TEXTURE_OT_envmap_save(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER; /* no undo since this doesnt modify the env-map */ /* properties */ - prop= RNA_def_float_array(ot->srna, "layout", 12, default_envmap_layout, 0.0f, 0.0f, "File layout", "Flat array describing the X,Y position of each cube face in the output image, where 1 is the size of a face. Order is [+Z -Z +Y -X -Y +X]. Use -1 to skip a face.", 0.0f, 0.0f); + prop= RNA_def_float_array(ot->srna, "layout", 12, default_envmap_layout, 0.0f, 0.0f, "File layout", "Flat array describing the X,Y position of each cube face in the output image, where 1 is the size of a face - order is [+Z -Z +Y -X -Y +X] (use -1 to skip a face)", 0.0f, 0.0f); RNA_def_property_flag(prop, PROP_HIDDEN); WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH); |