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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-19 17:36:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-19 17:36:09 +0300
commit4563849c1b3ca6eb7418ea2870f35a624ec04f81 (patch)
tree46ff162d9c06ca41025b51de3e756c8877e0f9cc /source/blender/editors/object
parent259879e135476da6255d1411d66089ccdc78ad9d (diff)
Fixes for particle system and physics
- Silence harmless error print about relation. Object with particle system which doesn't use physics will not have point cache component. - Tag relations for update when particle system physics type change. This ensures correct state of point cache component. This is all part of T59258.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_relations.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index d61c5334ee6..867b807c908 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1872,6 +1872,9 @@ static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *view_layer, V
if (ma->id.us > 1) {
man = BKE_material_copy(bmain, ma);
BKE_animdata_copy_id_action(bmain, &man->id, false);
+ if (man->nodetree != NULL) {
+ BKE_animdata_copy_id_action(bmain, &man->nodetree->id, false);
+ }
man->id.us = 0;
assign_material(bmain, ob, man, a, BKE_MAT_ASSIGN_USERPREF);