Commit: ef60fa9a2dc88f619ce026d019c24fd1eb6620f6
Author: Kévin Dietrich
Date: Tue Jun 28 01:47:06 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBef60fa9a2dc88f619ce026d019c24fd1eb6620f6
Cleanup.
===================================================================
M source/blender/blenkernel/intern/library.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c
b/source/blender/blenkernel/intern/library.c
index fca9094..8df2655 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -451,7 +451,7 @@ bool id_copy(ID *id, ID **newid, bool test)
return true;
case ID_CF:
if (!test) *newid = (ID *)BKE_cachefile_copy(G.main,
(CacheFile *)id);
- return true; /* not implemented */
+ return true;
}
return false;
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index 204d89f..5a29a3a 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3297,7 +3297,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
{"rna_armature.c", "rna_armature_api.c", RNA_def_armature},
{"rna_boid.c", NULL, RNA_def_boid},
{"rna_brush.c", NULL, RNA_def_brush},
- {"rna_cachefile.c", NULL, RNA_def_cachefile},
+ {"rna_cachefile.c", NULL, RNA_def_cachefile},
{"rna_camera.c", "rna_camera_api.c", RNA_def_camera},
{"rna_cloth.c", NULL, RNA_def_cloth},
{"rna_color.c", NULL, RNA_def_color},
diff --git a/source/blender/makesrna/intern/rna_constraint.c
b/source/blender/makesrna/intern/rna_constraint.c
index 7c75491..381716e 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -72,7 +72,7 @@ EnumPropertyItem rna_enum_constraint_type_items[] = {
"Compensate for scaling one axis by
applying suitable scaling to the other two axes"},
{CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA,
"Transformation",
"Use one transform property from target to
control another (or same) property on owner"},
- {CONSTRAINT_TYPE_TRANSFORMCACHE, "TRANSFORMCACHE", ICON_CONSTRAINT_DATA,
"Transform Cache",
+ {CONSTRAINT_TYPE_TRANSFORMCACHE, "TRANSFORMCACHE",
ICON_CONSTRAINT_DATA, "Transform Cache",
"Look up the transformation matrix from an
external file"},
{0, "", 0, N_("Tracking"), ""},
{CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, "Clamp
To",
diff --git a/source/blender/makesrna/intern/rna_main.c
b/source/blender/makesrna/intern/rna_main.c
index bdd30d0..bb38bca 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -360,7 +360,7 @@ void RNA_def_main(BlenderRNA *brna)
{"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie
Clips", "Movie Clip datablocks", RNA_def_main_movieclips},
{"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks
datablocks", RNA_def_main_masks},
{"linestyles", "FreestyleLineStyle",
"rna_Main_linestyle_begin", "Line Styles", "Line Style datablocks",
RNA_def_main_linestyles},
- {"cachefiles", "CacheFile", "rna_Main_cachefiles_begin", "Cache
Files", "Cache Files datablocks", RNA_def_main_cachefiles},
+ {"cachefiles", "CacheFile", "rna_Main_cachefiles_begin", "Cache
Files", "Cache Files datablocks", RNA_def_main_cachefiles},
{NULL, NULL, NULL, NULL, NULL, NULL}
};
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index 23cf782..b78f4d1 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3355,7 +3355,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
{SACTCONT_SHAPEKEY, "SHAPEKEY", ICON_SHAPEKEY_DATA, "Shape Key
Editor", "Edit keyframes in active object's Shape Keys action"},
{SACTCONT_GPENCIL, "GPENCIL", ICON_GREASEPENCIL, "Grease
Pencil", "Edit timings for all Grease Pencil sketches in file"},
{SACTCONT_MASK, "MASK", ICON_MOD_MASK, "Mask", "Edit timings
for Mask Editor splines"},
- {SACTCONT_CACHEFILE, "CACHEFILE", ICON_FILE, "Cache File", "Edit
timings for Cache File data-blocks"},
+ {SACTCONT_CACHEFILE, "CACHEFILE", ICON_FILE, "Cache File",
"Edit timings for Cache File data-blocks"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/modifiers/CMakeLists.txt
b/source/blender/modifiers/CMakeLists.txt
index 096d4f8..e560315 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -27,6 +27,7 @@
set(INC
.
intern
+ ../alembic
../blenkernel
../blenlib
../blenfont
@@ -36,7 +37,6 @@ set(INC
../bmesh
../render/extern/include
../../../intern/elbeem/extern
- ../alembic
../../../intern/guardedalloc
../../../intern/eigen
)
diff --git a/source/blender/modifiers/MOD_modifiertypes.h
b/source/blender/modifiers/MOD_modifiertypes.h
index 09f13c2..4c88144 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -81,7 +81,6 @@ extern ModifierTypeInfo modifierType_UVWarp;
extern ModifierTypeInfo modifierType_MeshCache;
extern ModifierTypeInfo modifierType_LaplacianDeform;
extern ModifierTypeInfo modifierType_Wireframe;
-extern ModifierTypeInfo modifierType_Alembic;
extern ModifierTypeInfo modifierType_DataTransfer;
extern ModifierTypeInfo modifierType_NormalEdit;
extern ModifierTypeInfo modifierType_CorrectiveSmooth;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
