griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-02-07 11:18:50 +11:00
parent 77b61b554c 1e4b612d6a
commit 17577c53c6
58 changed files with 91 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/convertblender.c
View File

@@ -56,7 +56,7 @@
#include "DNA_modifier_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"

23
source/blender/render/intern/source/pipeline.c
View File

@@ -41,6 +41,7 @@
#include "DNA_image_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
#include "DNA_userdef_types.h"
@@ -2104,6 +2105,28 @@ static void tag_dependend_objects_for_render(Scene *scene, int UNUSED(renderlay)
DEG_id_tag_update(&smd->target->id, OB_RECALC_DATA);
}
}
else if (md->type == eModifierType_ParticleSystem) {
ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md;
ParticleSystem *psys = psmd->psys;
ParticleSettings *part = psys->part;
switch (part->ren_as) {
case PART_DRAW_OB:
if (part->dup_ob != NULL) {
DEG_id_tag_update(&part->dup_ob->id, OB_RECALC_DATA);
}
break;
case PART_DRAW_GR:
if (part->dup_group != NULL) {
for (GroupObject *go = part->dup_group->gobject.first;
go != NULL;
go = go->next)
{
DEG_id_tag_update(&go->ob->id, OB_RECALC_DATA);
}
}
break;
}
}
}
}
}

2
source/blender/render/intern/source/voxeldata.c
View File

@@ -61,7 +61,7 @@
#include "BPH_mass_spring.h"
#include "DNA_texture_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_modifier_types.h"