Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-16 09:25:02 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-16 09:25:02 +0400
commit1823bb4abb68b24b6c8db4cd388a855457dc45f4 (patch)
tree65f2847a265ecefc86684045b030055848a0977f
parentebec1116184275f594cf08417b04fa43fa554628 (diff)
fix for building bmesh bevel with scons (source file was left out)
-rw-r--r--source/blender/bmesh/SConscript1
-rw-r--r--source/blender/editors/object/object_constraint.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/bmesh/SConscript b/source/blender/bmesh/SConscript
index e545dd64b02..e06f43bd85d 100644
--- a/source/blender/bmesh/SConscript
+++ b/source/blender/bmesh/SConscript
@@ -5,6 +5,7 @@ cflags=''
sources = env.Glob('intern/*.c')
sources += env.Glob('operators/*.c')
+sources += env.Glob('tools/*.c')
incs = [
'#/intern/guardedalloc',
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 774eec0e0a8..671c70c1f0f 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -142,6 +142,7 @@ bConstraint *get_active_constraint (Object *ob)
}
/* -------------- Constraint Management (Add New, Remove, Rename) -------------------- */
+#ifdef WITH_PYTHON
/* ------------- PyConstraints ------------------ */
/* this callback sets the text-file to be used for selected menu item */
@@ -160,7 +161,6 @@ static void validate_pyconstraint_cb (void *arg1, void *arg2)
data->text = text;
}
-#ifdef WITH_PYTHON
/* this returns a string for the list of usable pyconstraint script names */
static char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
{