[Bf-blender-cvs] [3c6c33b] alembic: Merge branch 'master' into alembic
Lukas Tönne
noreply at git.blender.org
Tue Mar 31 17:00:18 CEST 2015
Commit: 3c6c33be988e3ef167a69a980a8ce14b0ca44291
Author: Lukas Tönne
Date: Tue Mar 31 16:59:19 2015 +0200
Branches: alembic
https://developer.blender.org/rB3c6c33be988e3ef167a69a980a8ce14b0ca44291
Merge branch 'master' into alembic
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
===================================================================
===================================================================
diff --cc intern/cycles/app/cycles_standalone.cpp
index 28fecbf,72bd635..55d1f2b
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@@ -130,25 -120,11 +130,25 @@@ static void scene_init(
{
options.scene = new Scene(options.scene_params, options.session_params.device);
- /* Read XML */
- xml_read_file(options.scene, options.filepath.c_str());
+ /* Read file */
+ switch (options.filetype) {
+ case FILETYPE_XML:
+ xml_read_file(options.scene, options.filepath.c_str());
+ break;
+#ifdef WITH_ALEMBIC
+ case FILETYPE_ABC_OGAWA:
+ abc_read_ogawa_file(options.scene, options.filepath.c_str());
+ break;
+ case FILETYPE_ABC_HDF5:
+ abc_read_hdf5_file(options.scene, options.filepath.c_str());
+ break;
+#endif
+ default:
+ return;
+ }
/* Camera width/height override? */
- if (!(options.width == 0 || options.height == 0)) {
+ if(!(options.width == 0 || options.height == 0)) {
options.scene->camera->width = options.width;
options.scene->camera->height = options.height;
}
diff --cc source/blender/blenkernel/BKE_mesh.h
index 003d3ff,05c2041..932b93d
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -39,9 -38,7 +38,8 @@@ struct ListBase
struct LinkNode;
struct BLI_Stack;
struct MemArena;
- struct BMEditMesh;
struct BMesh;
+struct DupliObjectData;
struct Main;
struct Mesh;
struct MPoly;
diff --cc source/blender/blenkernel/intern/modifier.c
index 2433e4d,1f6d40d..4d007e1
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@@ -100,15 -99,13 +100,15 @@@ void BKE_modifier_init(void
virtualModifierCommonData.cmd.modifier.mode |= eModifierMode_Virtual;
virtualModifierCommonData.lmd.modifier.mode |= eModifierMode_Virtual;
virtualModifierCommonData.smd.modifier.mode |= eModifierMode_Virtual;
+
+ BKE_cache_modifier_init();
}
- ModifierTypeInfo *modifierType_getInfo(ModifierType type)
+ const ModifierTypeInfo *modifierType_getInfo(ModifierType type)
{
/* type unsigned, no need to check < 0 */
- if (type < NUM_MODIFIER_TYPES && modifier_types[type]->name[0] != '\0') {
- return modifier_types[type];
+ if (type < NUM_MODIFIER_TYPES && cache_modifier_types[type]->name[0] != '\0') {
+ return cache_modifier_types[type];
}
else {
return NULL;
diff --cc source/blender/blenloader/intern/readfile.c
index 601a6f3,b0aa477..04f108c
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5007,13 -4949,20 +5007,27 @@@ static void direct_link_modifiers(FileD
}
lmd->cache_system = NULL;
}
+ else if (md->type == eModifierType_CorrectiveSmooth) {
+ CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData*)md;
+
+ if (csmd->bind_coords) {
+ csmd->bind_coords = newdataadr(fd, csmd->bind_coords);
+ if (fd->flags & FD_FLAGS_SWITCH_ENDIAN) {
+ BLI_endian_switch_float_array((float *)csmd->bind_coords, csmd->bind_coords_num * 3);
+ }
+ }
+
+ /* runtime only */
+ csmd->delta_cache = NULL;
+ csmd->delta_cache_num = 0;
+ }
+ else if (md->type == eModifierType_Cache) {
+ CacheModifierData *cmd = (CacheModifierData *)md;
+
+ cmd->output_dm = NULL;
+ cmd->input_dm = NULL;
+ cmd->flag &= ~(MOD_CACHE_USE_OUTPUT_REALTIME | MOD_CACHE_USE_OUTPUT_RENDER);
+ }
}
}
diff --cc source/blender/editors/space_view3d/view3d_intern.h
index 26f05ba,95c0ef9..13c75cb
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@@ -46,10 -45,7 +45,8 @@@ struct bAnimVizSettings
struct bContext;
struct bMotionPath;
struct bPoseChannel;
- struct bScreen;
struct Mesh;
- struct SimDebugData;
+struct Strands;
struct wmNDOFMotionData;
struct wmOperatorType;
struct wmWindowManager;
diff --cc source/blender/makesdna/DNA_modifier_types.h
index 0ac1c85,f3c61f0..7c232d1
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -84,7 -84,7 +84,8 @@@ typedef enum ModifierType
eModifierType_Wireframe = 48,
eModifierType_DataTransfer = 49,
eModifierType_NormalEdit = 50,
- eModifierType_Cache = 51,
+ eModifierType_CorrectiveSmooth = 51,
++ eModifierType_Cache = 52,
NUM_MODIFIER_TYPES
} ModifierType;
diff --cc source/blender/makesrna/intern/rna_modifier.c
index 5b151cc,6353360..e11b07d
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -378,8 -378,8 +379,10 @@@ static StructRNA *rna_Modifier_refine(s
return &RNA_DataTransferModifier;
case eModifierType_NormalEdit:
return &RNA_NormalEditModifier;
+ case eModifierType_CorrectiveSmooth:
+ return &RNA_CorrectiveSmoothModifier;
+ case eModifierType_Cache:
+ return &RNA_CacheModifier;
/* Default */
case eModifierType_None:
case eModifierType_ShapeKey:
diff --cc source/blender/modifiers/MOD_modifiertypes.h
index 39dc736,a5d9675..0fd9844
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@@ -83,7 -83,7 +83,8 @@@ extern ModifierTypeInfo modifierType_La
extern ModifierTypeInfo modifierType_Wireframe;
extern ModifierTypeInfo modifierType_DataTransfer;
extern ModifierTypeInfo modifierType_NormalEdit;
+ extern ModifierTypeInfo modifierType_CorrectiveSmooth;
+extern ModifierTypeInfo modifierType_Cache;
/* MOD_util.c */
void modifier_type_init(ModifierTypeInfo *types[]);
diff --cc source/blender/modifiers/intern/MOD_util.c
index 608b114,be6f7af..0d408b0
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@@ -306,6 -306,6 +306,7 @@@ void modifier_type_init(ModifierTypeInf
INIT_TYPE(Wireframe);
INIT_TYPE(DataTransfer);
INIT_TYPE(NormalEdit);
+ INIT_TYPE(CorrectiveSmooth);
+ INIT_TYPE(Cache);
#undef INIT_TYPE
}
More information about the Bf-blender-cvs
mailing list