Commit: 0b5a60cc10b6690543fc43a144699bc4d1a0f524
Author: Kévin Dietrich
Date: Tue Jun 28 13:52:55 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB0b5a60cc10b6690543fc43a144699bc4d1a0f524
Cleanup.
===================================================================
M source/blender/editors/io/io_alembic.c
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/intern/makesdna.c
===================================================================
diff --git a/source/blender/editors/io/io_alembic.c
b/source/blender/editors/io/io_alembic.c
index 3eeb9e6..ad96ec6 100644
--- a/source/blender/editors/io/io_alembic.c
+++ b/source/blender/editors/io/io_alembic.c
@@ -312,7 +312,7 @@ static int cmp_frame(const void *a, const void *b)
return 0;
}
-static int get_seqeunce_len(char *filename, int *ofs)
+static int get_sequence_len(char *filename, int *ofs)
{
int frame;
int numdigit;
@@ -415,7 +415,7 @@ static int wm_alembic_import_exec(bContext *C, wmOperator
*op)
const bool set_frame_range = RNA_boolean_get(op->ptr,
"set_frame_range");
int offset = 0;
- int sequence_len = get_seqeunce_len(filename, &offset);
+ int sequence_len = get_sequence_len(filename, &offset);
const bool is_sequence = (sequence_len > 1);
ABC_import(C, filename, scale, is_sequence, set_frame_range,
sequence_len, offset);
diff --git a/source/blender/makesdna/DNA_constraint_types.h
b/source/blender/makesdna/DNA_constraint_types.h
index 5d58218..30e2895 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -500,7 +500,7 @@ typedef enum eBConstraint_Types {
CONSTRAINT_TYPE_FOLLOWTRACK = 26, /* Follow Track
Constraint */
CONSTRAINT_TYPE_CAMERASOLVER = 27, /* Camera Solver
Constraint */
CONSTRAINT_TYPE_OBJECTSOLVER = 28, /* Object Solver
Constraint */
- CONSTRAINT_TYPE_TRANSFORMCACHE = 29, /* Object Solver
Constraint */
+ CONSTRAINT_TYPE_TRANSFORMCACHE = 29, /* Transform Cache
Constraint */
/* NOTE: no constraints are allowed to be added after this */
NUM_CONSTRAINT_TYPES
diff --git a/source/blender/makesdna/intern/makesdna.c
b/source/blender/makesdna/intern/makesdna.c
index e82e1b1..b731ce6 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -129,7 +129,7 @@ static const char *includefiles[] = {
"DNA_rigidbody_types.h",
"DNA_freestyle_types.h",
"DNA_linestyle_types.h",
- "DNA_cachefile_types.h",
+ "DNA_cachefile_types.h",
/* see comment above before editing! */
/* empty string to indicate end of includefiles */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
