Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-05-16 02:23:05 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-05-16 02:23:25 +0400
commit57e1ec23088f2a4a16bdd27c301e2ffd8bee6cb1 (patch)
tree9e11b3a08c3ef34bd800d411110915d98faed9dc /source/blender/makesrna/intern/rna_particle.c
parent8b0729a7314324e1aea6655de8bd16bb3e5ff5cc (diff)
Fix part of T39708, don't overupdate particles when changine active
particle texture slot
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
-rw-r--r--source/blender/makesrna/intern/rna_particle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index f6f133c5114..a1dde4caf98 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2072,7 +2072,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
rna_def_mtex_common(brna, srna, "rna_ParticleSettings_mtex_begin", "rna_ParticleSettings_active_texture_get",
"rna_ParticleSettings_active_texture_set", NULL, "ParticleSettingsTextureSlot",
- "ParticleSettingsTextureSlots", "rna_Particle_reset");
+ "ParticleSettingsTextureSlots", "rna_Particle_reset", NULL);
/* fluid particle type can't be checked from the type value in rna as it's not shown in the menu */
prop = RNA_def_property(srna, "is_fluid", PROP_BOOLEAN, PROP_NONE);