[Bf-blender-cvs] [ce78586] master: Fix compile errors for when WITH_ALEMBIC is OFF.
Kévin Dietrich
noreply at git.blender.org
Sun Oct 30 03:43:22 CET 2016
Commit: ce785868a56a1446750f5af1779f7623ca462ec2
Author: Kévin Dietrich
Date: Sun Oct 30 03:42:46 2016 +0100
Branches: master
https://developer.blender.org/rBce785868a56a1446750f5af1779f7623ca462ec2
Fix compile errors for when WITH_ALEMBIC is OFF.
===================================================================
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 2a2699f..6a08673 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -212,7 +212,9 @@ void BKE_cachefile_clean(Scene *scene, CacheFile *cache_file)
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
if (cache_file == mcmd->cache_file) {
+#ifdef WITH_ALEMBIC
CacheReader_free(mcmd->reader);
+#endif
mcmd->reader = NULL;
mcmd->object_path[0] = '\0';
}
@@ -226,7 +228,9 @@ void BKE_cachefile_clean(Scene *scene, CacheFile *cache_file)
bTransformCacheConstraint *data = con->data;
if (cache_file == data->cache_file) {
+#ifdef WITH_ALEMBIC
CacheReader_free(data->reader);
+#endif
data->reader = NULL;
data->object_path[0] = '\0';
}
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index c775070..b85f1b8 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4401,7 +4401,9 @@ static void transformcache_free(bConstraint *con)
}
if (data->reader) {
+#ifdef WITH_ALEMBIC
CacheReader_free(data->reader);
+#endif
}
}
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index ad037af..de1a0f2 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -478,6 +478,7 @@ static void rna_Constraint_objectSolver_camera_set(PointerRNA *ptr, PointerRNA v
static void rna_Constraint_transformCache_object_path_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
+#ifdef WITH_ALEMBIC
bConstraint *con = (bConstraint *)ptr->data;
bTransformCacheConstraint *data = (bTransformCacheConstraint *)con->data;
Object *ob = (Object *)ptr->id.data;
@@ -486,6 +487,7 @@ static void rna_Constraint_transformCache_object_path_update(Main *bmain, Scene
data->reader,
ob,
data->object_path);
+#endif
rna_Constraint_update(bmain, scene, ptr);
}
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index b30c156..c4f0db3 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1133,6 +1133,7 @@ static int rna_CorrectiveSmoothModifier_is_bind_get(PointerRNA *ptr)
static void rna_MeshSequenceCache_object_path_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
+#ifdef WITH_ALEMBIC
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)ptr->data;
Object *ob = (Object *)ptr->id.data;
@@ -1140,6 +1141,7 @@ static void rna_MeshSequenceCache_object_path_update(Main *bmain, Scene *scene,
mcmd->reader,
ob,
mcmd->object_path);
+#endif
rna_Modifier_update(bmain, scene, ptr);
}
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index cf13778..d25e8e3 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -78,7 +78,9 @@ static void freeData(ModifierData *md)
}
if (mcmd->reader) {
+#ifdef WITH_ALEMBIC
CacheReader_free(mcmd->reader);
+#endif
}
}
More information about the Bf-blender-cvs
mailing list