[Bf-blender-cvs] [c6bb6ef] alembic_basic_io: Minor edits for alembic branch
Campbell Barton
noreply at git.blender.org
Wed Jul 20 21:41:35 CEST 2016
Commit: c6bb6ef1448df9901dd25df6c090096268f39003
Author: Campbell Barton
Date: Thu Jul 21 05:46:16 2016 +1000
Branches: alembic_basic_io
https://developer.blender.org/rBc6bb6ef1448df9901dd25df6c090096268f39003
Minor edits for alembic branch
- naming
- remove redundant cast
===================================================================
M release/scripts/startup/bl_ui/properties_constraint.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/abc_util.cc
M source/blender/blenkernel/BKE_cachefile.h
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/blenkernel/intern/idcode.c
M source/blender/blenloader/intern/readfile.c
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/object/object_constraint.c
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/modifiers/CMakeLists.txt
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index f6cde00..af7470f 100644
--- a/release/scripts/startup/bl_ui/properties_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_constraint.py
@@ -880,7 +880,7 @@ class ConstraintButtonsPanel:
layout.operator("clip.constraint_to_fcurve")
- def TRANSFORMCACHE(self, context, layout, con):
+ def TRANSFORM_CACHE(self, context, layout, con):
layout.label(text="Cache File Properties:")
box = layout.box()
box.template_cache_file(con, "cache_file")
@@ -890,7 +890,7 @@ class ConstraintButtonsPanel:
layout.label(text="Constraint Properties:")
box = layout.box()
- if cache_file != None:
+ if cache_file is not None:
box.prop_search(con, "abc_object_path", cache_file, "object_paths")
def SCRIPT(self, context, layout, con):
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 01286f4..3b20a85 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -227,7 +227,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
layout.label(text="Modifier Properties:")
box = layout.box()
- if cache_file != None:
+ if cache_file is not None:
box.prop_search(md, "abc_object_path", cache_file, "object_paths")
def CAST(self, layout, ob, md):
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index d748c33..a018425 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -115,7 +115,6 @@ static bool object_is_shape(Object *ob)
}
return true;
- break;
case OB_CURVE:
case OB_SURF:
case OB_CAMERA:
@@ -135,7 +134,7 @@ static bool export_object(const ExportSettings * const settings, Object *ob)
return false;
}
- if (settings->renderable_only && (ob->restrictflag & 4)) {
+ if (settings->renderable_only && (ob->restrictflag & OB_RESTRICT_RENDER)) {
return false;
}
@@ -258,12 +257,14 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled)
}
else
#endif
+ {
m_archive = Alembic::Abc::CreateArchiveWithInfo(Alembic::AbcCoreOgawa::WriteArchive(),
m_filename,
"Blender",
scene_name,
Alembic::Abc::ErrorHandler::kThrowPolicy,
arg);
+ }
/* Create time samplings for transforms and shapes. */
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index 24f699b..740ba05 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -205,7 +205,7 @@ void AbcObjectReader::readObjectMatrix(const float time)
BKE_object_apply_mat4(m_object, m_object->obmat, false, false);
if (!schema.isConstant()) {
- bConstraint *con = BKE_constraint_add_for_object(m_object, NULL, CONSTRAINT_TYPE_TRANSFORMCACHE);
+ bConstraint *con = BKE_constraint_add_for_object(m_object, NULL, CONSTRAINT_TYPE_TRANSFORM_CACHE);
bTransformCacheConstraint *data = static_cast<bTransformCacheConstraint *>(con->data);
BLI_strncpy(data->abc_object_path, m_iobject.getFullName().c_str(), FILE_MAX);
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 89969dd..fbab0bc 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -36,8 +36,7 @@ std::string get_id_name(Object *ob)
return "";
}
- ID *id = reinterpret_cast<ID *>(ob);
- return get_id_name(id);
+ return get_id_name(&ob->id);
}
std::string get_id_name(ID *id)
diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index 4d553a5..2626a11 100644
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -48,8 +48,9 @@ void BKE_cachefile_load(struct CacheFile *cache_file, const char *relabase);
void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene, float ctime, const float fps);
-bool BKE_cachefile_filepath_get(struct CacheFile *cache_file, float frame,
- char *r_filename);
+bool BKE_cachefile_filepath_get(
+ const struct CacheFile *cache_file, float frame,
+ char *r_filename);
float BKE_cachefile_time_offset(struct CacheFile *cache_file, const float time, const float fps);
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index c296aa0..effbecb 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -143,7 +143,7 @@ void BKE_cachefile_update_frame(Main *bmain, Scene *scene, const float ctime, co
}
}
-bool BKE_cachefile_filepath_get(CacheFile *cache_file, float frame, char *r_filepath)
+bool BKE_cachefile_filepath_get(const CacheFile *cache_file, float frame, char *r_filepath)
{
get_absolute_path(r_filepath, cache_file->filepath, G.main->name);
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 117e8d4..d0cb783 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4387,8 +4387,8 @@ static void transformcache_free(bConstraint *con)
}
}
-static bConstraintTypeInfo CTI_TRANSFORMCACHE = {
- CONSTRAINT_TYPE_TRANSFORMCACHE, /* type */
+static bConstraintTypeInfo CTI_TRANSFORM_CACHE = {
+ CONSTRAINT_TYPE_TRANSFORM_CACHE, /* type */
sizeof(bTransformCacheConstraint), /* size */
"Transform Cache", /* name */
"bTransformCacheConstraint", /* struct name */
@@ -4443,7 +4443,7 @@ static void constraints_init_typeinfo(void)
constraintsTypeInfo[26] = &CTI_FOLLOWTRACK; /* Follow Track Constraint */
constraintsTypeInfo[27] = &CTI_CAMERASOLVER; /* Camera Solver Constraint */
constraintsTypeInfo[28] = &CTI_OBJECTSOLVER; /* Object Solver Constraint */
- constraintsTypeInfo[29] = &CTI_TRANSFORMCACHE; /* Transform Cache Constraint */
+ constraintsTypeInfo[29] = &CTI_TRANSFORM_CACHE; /* Transform Cache Constraint */
}
/* This function should be used for getting the appropriate type-info when only
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 92ad9c4..c445c9c 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2173,7 +2173,12 @@ static void dag_object_time_update_flags(Main *bmain, Scene *scene, Object *ob)
if (cti) {
/* special case for camera tracking -- it doesn't use targets to define relations */
- if (ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER, CONSTRAINT_TYPE_OBJECTSOLVER, CONSTRAINT_TYPE_TRANSFORMCACHE)) {
+ if (ELEM(cti->type,
+ CONSTRAINT_TYPE_FOLLOWTRACK,
+ CONSTRAINT_TYPE_CAMERASOLVER,
+ CONSTRAINT_TYPE_OBJECTSOLVER,
+ CONSTRAINT_TYPE_TRANSFORM_CACHE))
+ {
ob->recalc |= OB_RECALC_OB;
}
else if (cti->get_constraint_targets) {
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index e64eeaf..1127d1d 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -60,7 +60,7 @@ static IDType idtypes[] = {
{ ID_AR, "Armature", "armatures", BLT_I18NCONTEXT_ID_ARMATURE, IDTYPE_FLAGS_ISLINKABLE },
{ ID_BR, "Brush", "brushes", BLT_I18NCONTEXT_ID_BRUSH, IDTYPE_FLAGS_ISLINKABLE },
{ ID_CA, "Camera", "cameras", BLT_I18NCONTEXT_ID_CAMERA, IDTYPE_FLAGS_ISLINKABLE },
- { ID_CF, "CacheFile", "cachefiles", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE },
+ { ID_CF, "CacheFile", "cache_files", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE },
{ ID_CU, "Curve", "curves", BLT_I18NCONTEXT_ID_CURVE, IDTYPE_FLAGS_ISLINKABLE },
{ ID_GD, "GPencil", "grease_pencil", BLT_I18NCONTEXT_ID_GPENCIL, IDTYPE_FLAGS_ISLINKABLE }, /* rename gpencil */
{ ID_GR, "Group", "groups", BLT_I18NCONTEXT_ID_GROUP, IDTYPE_FLAGS_ISLINKABLE },
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3bfabd9..08d3473 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -159,6 +159,7 @@
#include "readfile.h"
+
#include <errno.h>
/**
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 2e507b7..9ab2833 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -600,7 +600,7 @@ void DepsgraphRelationBuilder::build_constraints(Scene *scene, ID *id, eDepsNode
TimeSourceKey time_src_key;
add_relation(time_src_key, constraint_op_key, DEPSREL_TYPE_TIME, "[TimeSrc -> Animation]");
}
- else if (cti->type == CONSTRAINT_TYPE_TRANSFORMCACHE) {
+ else if (cti->type == CONSTRAINT_TYPE_TRANSFORM_CACHE) {
/* TODO(kevin): This is more a TimeSource -> CacheFile -> Constraint dependency chain. */
TimeSourceKey time_src_key;
add_relation(time_src_key, constraint_op_key, DEPSREL_TYPE_TIME, "[TimeSrc -> Animation]");
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index a2e43c6..5f675e6 100644
--- a/source/blender/editors/animation/keyfra
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list