Revision: 18339
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18339
Author: ton
Date: 2009-01-05 16:19:31 +0100 (Mon, 05 Jan 2009)
Log Message:
-----------
2.5
Put back Armature/Pose code, including 'heat weight'.
I've added reeb.h to get things compile, but Martin will
cleanup files and put back?
Now where to put all vertexgroup code.... I guess mesh?
Note for msvc: yep, another new dir to add! :)
Modified Paths:
--------------
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/editors/Makefile
branches/blender2.5/blender/source/blender/editors/SConscript
branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/mesh/editface.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_orientations.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/armature/
branches/blender2.5/blender/source/blender/editors/armature/Makefile
branches/blender2.5/blender/source/blender/editors/armature/SConscript
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c
branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.h
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/armature/reeb.h
branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/include/BIF_editarmature.h
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2009-01-05 10:54:26 UTC (rev
18338)
+++ branches/blender2.5/blender/source/Makefile 2009-01-05 15:19:31 UTC (rev
18339)
@@ -240,6 +240,7 @@
PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
PULIB += $(OCGDIR)/blender/ed_object/libed_object.a
PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
+PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a
PULIB += $(OCGDIR)/blender/ed_util/libed_util.a
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
2009-01-05 10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
2009-01-05 15:19:31 UTC (rev 18339)
@@ -80,7 +80,6 @@
void bone_flip_name (char *name, int strip_number);
void bone_autoside_name (char *name, int strip_number, short axis, float head,
float tail);
-struct bArmature *get_armature (struct Object *ob);
struct Bone *get_named_bone (struct bArmature *arm, const char *name);
float distfactor_to_bone (float vec[3], float b1[3], float b2[3], float rad1,
float rad2, float rdist);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
2009-01-05 10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
2009-01-05 15:19:31 UTC (rev 18339)
@@ -81,7 +81,6 @@
struct Object *add_only_object(int type, char *name);
struct Object *add_object(struct Scene *scene, int type);
-void base_init_from_view3d(struct Base *base, struct View3D *v3d, struct Scene
*scene);
struct Object *copy_object(struct Object *ob);
void expand_local_object(struct Object *ob);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
2009-01-05 10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
2009-01-05 15:19:31 UTC (rev 18339)
@@ -77,13 +77,6 @@
/* **************** Generic Functions, data level *************** */
-bArmature *get_armature(Object *ob)
-{
- if(ob==NULL) return NULL;
- if(ob->type==OB_ARMATURE) return ob->data;
- else return NULL;
-}
-
bArmature *add_armature(char *name)
{
bArmature *arm;
@@ -2275,7 +2268,8 @@
float imat[4][4];
float ctime;
- arm = get_armature(ob);
+ if(ob->type!=OB_ARMATURE) return;
+ arm = ob->data;
if(ELEM(NULL, arm, scene)) return;
if((ob->pose==NULL) || (ob->pose->flag & POSE_RECALC))
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-01-05 10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-01-05 15:19:31 UTC (rev 18339)
@@ -1009,38 +1009,6 @@
return ob;
}
-void base_init_from_view3d(Base *base, View3D *v3d, struct Scene *scene)
-{
- Object *ob= base->object;
-
- if (!v3d) {
- /* no 3d view, this wont happen often */
- base->lay = 1;
- VECCOPY(ob->loc, scene->cursor);
-
- /* return now because v3d->viewquat isnt available */
- return;
- } else if (v3d->localview) {
- base->lay= ob->lay= v3d->layact + v3d->lay;
- VECCOPY(ob->loc, v3d->cursor);
- } else {
- base->lay= ob->lay= v3d->layact;
- VECCOPY(ob->loc, scene->cursor);
- }
-
- if (U.flag & USER_ADD_VIEWALIGNED) {
- v3d->viewquat[0]= -v3d->viewquat[0];
-
- /* Quats arnt used yet */
- /*if (ob->transflag & OB_QUAT) {
- QUATCOPY(ob->quat, v3d->viewquat);
- } else {*/
- QuatToEul(v3d->viewquat, ob->rot);
- /*}*/
- v3d->viewquat[0]= -v3d->viewquat[0];
- }
-}
-
SoftBody *copy_softbody(SoftBody *sb)
{
SoftBody *sbn;
@@ -1628,11 +1596,9 @@
static void ob_parbone(Object *ob, Object *par, float mat[][4])
{
bPoseChannel *pchan;
- bArmature *arm;
float vec[3];
- arm=get_armature(par);
- if (!arm) {
+ if (ob->type!=OB_ARMATURE) {
Mat4One(mat);
return;
}
Modified: branches/blender2.5/blender/source/blender/editors/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/Makefile 2009-01-05
10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/editors/Makefile 2009-01-05
15:19:31 UTC (rev 18339)
@@ -29,6 +29,6 @@
# Bounces make to subdirectories.
SOURCEDIR = source/blender/editors
-DIRS = mesh animation object datafiles transform screen space_outliner
space_time space_view3d interface util space_api space_ipo space_image
space_node space_buttons space_info space_file space_sound space_action
space_nla space_script space_text space_sequencer
+DIRS = armature mesh animation object datafiles transform screen
space_outliner space_time space_view3d interface util space_api space_ipo
space_image space_node space_buttons space_info space_file space_sound
space_action space_nla space_script space_text space_sequencer
include nan_subdirs.mk
Modified: branches/blender2.5/blender/source/blender/editors/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/SConscript
2009-01-05 10:54:26 UTC (rev 18338)
+++ branches/blender2.5/blender/source/blender/editors/SConscript
2009-01-05 15:19:31 UTC (rev 18339)
@@ -7,6 +7,7 @@
'util/SConscript',
'interface/SConscript',
'animation/SConscript',
+ 'armature/SConscript',
'mesh/SConscript',
'object/SConscript',
'space_buttons/SConscript',
Added: branches/blender2.5/blender/source/blender/editors/armature/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/Makefile
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/armature/Makefile
2009-01-05 15:19:31 UTC (rev 18339)
@@ -0,0 +1,59 @@
+#
+# $Id: Makefile 14 2002-10-13 15:57:19Z hans $
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2007 Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Makes module object directory and bounces make to subdirectories.
+
+LIBNAME = ed_armature
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I$(NAN_GLEW)/include
+CPPFLAGS += -I$(OPENGL_HEADERS)
+
+CPPFLAGS += -I$(NAN_BMFONT)/include
+CPPFLAGS += -I$(NAN_OPENNL)/include
+
+# not very neat....
+CPPFLAGS += -I../../windowmanager
+CPPFLAGS += -I../../blenloader
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I../../python
+CPPFLAGS += -I../../gpu
+CPPFLAGS += -I../../makesrna
+CPPFLAGS += -I../../render/extern/include
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+
+# own include
+
+CPPFLAGS += -I../include
Added: branches/blender2.5/blender/source/blender/editors/armature/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/SConscript
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/armature/SConscript
2009-01-05 15:19:31 UTC (rev 18339)
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont'
+incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
+
+env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [],
libtype=['core'], priority=[40] )
Added:
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
(rev 0)
+++
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
2009-01-05 15:19:31 UTC (rev 18339)
@@ -0,0 +1,39 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
