[Bf-blender-cvs] [069569f] blender2.8: Merge branch 'master' into blender2.8
Bastien Montagne
noreply at git.blender.org
Sun Aug 21 13:20:02 CEST 2016
Commit: 069569f82011c833937df07ec7945751c02f0a9c
Author: Bastien Montagne
Date: Sun Aug 21 13:18:26 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB069569f82011c833937df07ec7945751c02f0a9c
Merge branch 'master' into blender2.8
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/
Conflicts:
intern/ghost/intern/GHOST_WindowWin32.cpp
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/gpu/intern/gpu_debug.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_particle.c
===================================================================
===================================================================
diff --cc source/blender/alembic/intern/abc_exporter.cc
index 127e885,f71d78b..132c59c
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -44,6 -44,6 +44,7 @@@ extern "C"
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
++#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_space_types.h" /* for FILE_MAX */
@@@ -59,7 -59,7 +60,6 @@@
#include "BKE_idprop.h"
#include "BKE_main.h"
#include "BKE_modifier.h"
--#include "BKE_particle.h"
#include "BKE_scene.h"
}
@@@ -518,22 -520,22 +520,6 @@@ void AbcExporter::createShapeWriter(Obj
return;
}
-- ParticleSystem *psys = static_cast<ParticleSystem *>(ob->particlesystem.first);
--
-- for (; psys; psys = psys->next) {
-- if (!psys_check_enabled(ob, psys, G.is_rendering) || !psys->part) {
-- continue;
-- }
--
-- if (psys->part->type == PART_HAIR) {
-- m_settings.export_child_hairs = true;
-- m_shapes.push_back(new AbcHairWriter(m_scene, ob, xform, m_shape_sampling_index, m_settings, psys));
-- }
-- else if (psys->part->type == PART_EMITTER) {
-- m_shapes.push_back(new AbcPointsWriter(m_scene, ob, xform, m_shape_sampling_index, m_settings, psys));
-- }
-- }
--
switch(ob->type) {
case OB_MESH:
{
diff --cc source/blender/alembic/intern/abc_hair.cc
index 45bf9b7,45bf9b7..967c99d
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@@ -37,7 -37,7 +37,6 @@@ extern "C"
#include "BKE_DerivedMesh.h"
#include "BKE_object.h"
--#include "BKE_particle.h"
}
using Alembic::Abc::P3fArraySamplePtr;
@@@ -54,10 -54,10 +53,10 @@@ AbcHairWriter::AbcHairWriter(Scene *sce
AbcTransformWriter *parent,
uint32_t time_sampling,
ExportSettings &settings,
-- ParticleSystem *psys)
++ void *UNUSED(psys))
: AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
-- m_psys = psys;
++ m_psys = NULL; // = psys;
OCurves curves(parent->alembicXform(), m_name, m_time_sampling);
m_schema = curves.getSchema();
@@@ -68,7 -68,7 +67,7 @@@ void AbcHairWriter::do_write(
if (!m_psys) {
return;
}
--
++#if 0
ParticleSystemModifierData *psmd = psys_get_modifier(m_object, m_psys);
if (!psmd->dm_final) {
@@@ -116,15 -116,15 +115,17 @@@
m_sample.setSelfBounds(bounds());
m_schema.set(m_sample);
++#endif
}
void AbcHairWriter::write_hair_sample(DerivedMesh *dm,
-- ParticleSettings *part,
++ void *part,
std::vector<Imath::V3f> &verts,
std::vector<Imath::V3f> &norm_values,
std::vector<Imath::V2f> &uv_values,
std::vector<int32_t> &hvertices)
{
++#if 0
/* Get untransformed vertices, there's a xform under the hair. */
float inv_mat[4][4];
invert_m4_m4_safe(inv_mat, m_object->obmat);
@@@ -225,15 -225,15 +226,17 @@@
++path;
}
}
++#endif
}
void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm,
-- ParticleSettings *part,
++ void *part,
std::vector<Imath::V3f> &verts,
std::vector<Imath::V3f> &norm_values,
std::vector<Imath::V2f> &uv_values,
std::vector<int32_t> &hvertices)
{
++#if 0
/* Get untransformed vertices, there's a xform under the hair. */
float inv_mat[4][4];
invert_m4_m4_safe(inv_mat, m_object->obmat);
@@@ -287,4 -287,4 +290,5 @@@
++path;
}
}
++#endif
}
diff --cc source/blender/alembic/intern/abc_hair.h
index d132b60,d132b60..bbd5f2c
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@@ -26,13 -26,13 +26,11 @@@
#include "abc_object.h"
struct DerivedMesh;
--struct ParticleSettings;
--struct ParticleSystem;
/* ************************************************************************** */
class AbcHairWriter : public AbcObjectWriter {
-- ParticleSystem *m_psys;
++ /*ParticleSystem*/ void *m_psys;
Alembic::AbcGeom::OCurvesSchema m_schema;
Alembic::AbcGeom::OCurvesSchema::Sample m_sample;
@@@ -43,20 -43,20 +41,20 @@@ public
AbcTransformWriter *parent,
uint32_t time_sampling,
ExportSettings &settings,
-- ParticleSystem *psys);
++ /*ParticleSystem*/void *psys);
private:
virtual void do_write();
void write_hair_sample(DerivedMesh *dm,
-- ParticleSettings *part,
++ /*ParticleSettings*/ void *part,
std::vector<Imath::V3f> &verts,
std::vector<Imath::V3f> &norm_values,
std::vector<Imath::V2f> &uv_values,
std::vector<int32_t> &hvertices);
void write_hair_child_sample(DerivedMesh *dm,
-- ParticleSettings *part,
++ /*ParticleSettings*/ void *part,
std::vector<Imath::V3f> &verts,
std::vector<Imath::V3f> &norm_values,
std::vector<Imath::V2f> &uv_values,
diff --cc source/blender/alembic/intern/abc_mesh.cc
index f1c7b6b,b80b7c0..4db3328
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@@ -272,7 -272,7 +272,7 @@@ static ModifierData *get_subsurf_modifi
}
/* mesh is not a subsurf. break */
-- if ((md->type != eModifierType_Displace) && (md->type != eModifierType_ParticleSystem)) {
++ if ((md->type != eModifierType_Displace) /*&& (md->type != eModifierType_ParticleSystem)*/) {
return NULL;
}
}
diff --cc source/blender/alembic/intern/abc_points.cc
index fa5b71a,758d482..22a51d9
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@@ -30,11 -30,11 +30,11 @@@
extern "C" {
#include "DNA_mesh_types.h"
++#include "DNA_object_types.h"
#include "BKE_lattice.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
--#include "BKE_particle.h"
#include "BKE_scene.h"
#include "BLI_math.h"
@@@ -61,10 -61,10 +61,10 @@@ AbcPointsWriter::AbcPointsWriter(Scene
AbcTransformWriter *parent,
uint32_t time_sampling,
ExportSettings &settings,
-- ParticleSystem *psys)
++ void *UNUSED(psys))
: AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
-- m_psys = psys;
++ m_psys = NULL; // = psys;
OPoints points(parent->alembicXform(), m_name, m_time_sampling);
m_schema = points.getSchema();
@@@ -75,7 -75,7 +75,7 @@@ void AbcPointsWriter::do_write(
if (!m_psys) {
return;
}
--
++#if 0
std::vector<Imath::V3f> points;
std::vector<Imath::V3f> velocities;
std::vector<float> widths;
@@@ -132,6 -132,6 +132,7 @@@
m_sample.setSelfBounds(bounds());
m_schema.set(m_sample);
++#endif
}
/* ************************************************************************** */
diff --cc source/blender/alembic/intern/abc_points.h
index 51f3103,51f3103..cfa51e6
--- a/source/blender/alembic/intern/abc_points.h
+++ b/source/blender/alembic/intern/abc_points.h
@@@ -28,14 -28,14 +28,12 @@@
#include "abc_object.h"
#include "abc_customdata.h"
--class ParticleSystem;
--
/* ************************************************************************** */
class AbcPointsWriter : public AbcObjectWriter {
Alembic::AbcGeom::OPointsSchema m_schema;
Alembic::AbcGeom::OPointsSchema::Sample m_sample;
-- ParticleSystem *m_psys;
++ /*ParticleSystem*/ void *m_psys;
public:
AbcPointsWriter(Scene *scene,
@@@ -43,7 -43,7 +41,7 @@@
AbcTransformWriter *parent,
uint32_t time_sampling,
ExportSettings &settings,
-- ParticleSystem *psys);
++ /*ParticleSystem*/ void *psys);
void do_write();
};
diff --cc source/blender/blenkernel/BKE_effect.h
index 6d6740c,b934ec7..90fe360
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@@ -105,7 -110,7 +107,7 @@@ typedef struct EffectorCache
} EffectorCache;
void free_partdeflect(struct PartDeflect *pd);
- struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct EffectorWeights *weights, bool precalc);
-struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct ParticleSystem *psys_src, struct EffectorWeights *weights, bool for_simulation);
++struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct EffectorWeights *weights, bool for_simulation);
void pdEndEffectors(struct ListBase **effectors);
void pdPrecalculateEffectors(struct ListBase *effectors);
void pdDoEffectors(struct ListBase *effectors, struct ListBase *colliders, struct EffectorWeights *weights, struct EffectedPoint *point, float *force, float *impulse);
diff --cc source/blender/blenkernel/intern/depsgraph.c
index b6bfe33,5f8332d..184688b
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@@ -450,29 -453,51 +453,51 @@@ static void dag_add_lamp_driver_relatio
la->id.tag &= ~LIB_TAG_DOIT;
}
- static void check_and_create_collision_relation(DagForest *dag, Object *ob, DagNode *node, Object *ob1, int skip_forcefield, bool no_collision)
+ static void create_collision_relation(DagForest *dag, DagNode *node, Object *ob1, const char *name)
{
- DagNode *node2;
- if (ob1->pd && (ob1->pd->deflect || ob1->pd->forcefield) && (ob1
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list