diff options
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 7eb2552487b..837573ad175 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -36,6 +36,7 @@ #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_world_types.h" @@ -1774,6 +1775,9 @@ static void copy_mtex_copybuf(ID *id) mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]); // mtex= wrld->mtex[(int)wrld->texact]; // TODO break; + case ID_PA: + mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]); + break; case ID_LS: mtex = &(((FreestyleLineStyle *)id)->mtex[(int)((FreestyleLineStyle *)id)->texact]); break; @@ -1807,6 +1811,9 @@ static void paste_mtex_copybuf(ID *id) mtex = &(((World *)id)->mtex[(int)((World *)id)->texact]); // mtex= wrld->mtex[(int)wrld->texact]; // TODO break; + case ID_PA: + mtex = &(((ParticleSettings *)id)->mtex[(int)((ParticleSettings *)id)->texact]); + break; case ID_LS: mtex = &(((FreestyleLineStyle *)id)->mtex[(int)((FreestyleLineStyle *)id)->texact]); break; @@ -1875,6 +1882,7 @@ static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) Material *ma = CTX_data_pointer_get_type(C, "material", &RNA_Material).data; Lamp *la = CTX_data_pointer_get_type(C, "lamp", &RNA_Lamp).data; World *wo = CTX_data_pointer_get_type(C, "world", &RNA_World).data; + ParticleSystem *psys = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data; FreestyleLineStyle *linestyle = CTX_data_pointer_get_type(C, "line_style", &RNA_FreestyleLineStyle).data; if (ma) @@ -1883,6 +1891,8 @@ static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) id = &la->id; else if (wo) id = &wo->id; + else if (psys) + id = &psys->part->id; else if (linestyle) id = &linestyle->id; |