[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12900] branches/animsys-aligorith: == AnimSys Branch ==
Joshua Leung
aligorith at gmail.com
Sun Dec 16 01:33:40 CET 2007
Revision: 12900
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12900
Author: aligorith
Date: 2007-12-16 01:33:40 +0100 (Sun, 16 Dec 2007)
Log Message:
-----------
== AnimSys Branch ==
Merge with trunk: r 12832/3 - 12899 (HEAD)
Modified Paths:
--------------
branches/animsys-aligorith/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/animsys-aligorith/intern/elbeem/intern/isosurface.cpp
branches/animsys-aligorith/intern/elbeem/intern/solver_adap.cpp
branches/animsys-aligorith/intern/elbeem/intern/solver_main.cpp
branches/animsys-aligorith/projectfiles_vc7/blender/blender.sln
branches/animsys-aligorith/projectfiles_vc7/blender/src/BL_src.vcproj
branches/animsys-aligorith/source/blender/blenkernel/BKE_bad_level_calls.h
branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h
branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h
branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c
branches/animsys-aligorith/source/blender/blenkernel/intern/anim.c
branches/animsys-aligorith/source/blender/blenkernel/intern/curve.c
branches/animsys-aligorith/source/blender/blenkernel/intern/depsgraph.c
branches/animsys-aligorith/source/blender/blenkernel/intern/displist.c
branches/animsys-aligorith/source/blender/blenkernel/intern/mesh.c
branches/animsys-aligorith/source/blender/blenkernel/intern/particle.c
branches/animsys-aligorith/source/blender/blenkernel/intern/particle_system.c
branches/animsys-aligorith/source/blender/blenlib/BLI_arithb.h
branches/animsys-aligorith/source/blender/blenlib/BLI_blenlib.h
branches/animsys-aligorith/source/blender/blenlib/intern/util.c
branches/animsys-aligorith/source/blender/blenloader/intern/readfile.c
branches/animsys-aligorith/source/blender/include/BIF_editarmature.h
branches/animsys-aligorith/source/blender/include/BIF_gl.h
branches/animsys-aligorith/source/blender/include/BIF_interface.h
branches/animsys-aligorith/source/blender/include/butspace.h
branches/animsys-aligorith/source/blender/include/transform.h
branches/animsys-aligorith/source/blender/makesdna/DNA_constraint_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_listBase.h
branches/animsys-aligorith/source/blender/makesdna/DNA_object_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_scene_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_userdef_types.h
branches/animsys-aligorith/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/animsys-aligorith/source/blender/python/BPY_interface.c
branches/animsys-aligorith/source/blender/python/BPY_menus.c
branches/animsys-aligorith/source/blender/python/api2_2x/Armature.c
branches/animsys-aligorith/source/blender/python/api2_2x/Armature.h
branches/animsys-aligorith/source/blender/python/api2_2x/BGL.c
branches/animsys-aligorith/source/blender/python/api2_2x/BGL.h
branches/animsys-aligorith/source/blender/python/api2_2x/BezTriple.c
branches/animsys-aligorith/source/blender/python/api2_2x/BezTriple.h
branches/animsys-aligorith/source/blender/python/api2_2x/Blender.c
branches/animsys-aligorith/source/blender/python/api2_2x/Blender.h
branches/animsys-aligorith/source/blender/python/api2_2x/Bone.c
branches/animsys-aligorith/source/blender/python/api2_2x/Bone.h
branches/animsys-aligorith/source/blender/python/api2_2x/Camera.c
branches/animsys-aligorith/source/blender/python/api2_2x/Camera.h
branches/animsys-aligorith/source/blender/python/api2_2x/Constraint.c
branches/animsys-aligorith/source/blender/python/api2_2x/Constraint.h
branches/animsys-aligorith/source/blender/python/api2_2x/CurNurb.c
branches/animsys-aligorith/source/blender/python/api2_2x/CurNurb.h
branches/animsys-aligorith/source/blender/python/api2_2x/Curve.c
branches/animsys-aligorith/source/blender/python/api2_2x/Curve.h
branches/animsys-aligorith/source/blender/python/api2_2x/Draw.c
branches/animsys-aligorith/source/blender/python/api2_2x/Draw.h
branches/animsys-aligorith/source/blender/python/api2_2x/EXPP_interface.c
branches/animsys-aligorith/source/blender/python/api2_2x/EXPP_interface.h
branches/animsys-aligorith/source/blender/python/api2_2x/Effect.c
branches/animsys-aligorith/source/blender/python/api2_2x/Effect.h
branches/animsys-aligorith/source/blender/python/api2_2x/Font.c
branches/animsys-aligorith/source/blender/python/api2_2x/Font.h
branches/animsys-aligorith/source/blender/python/api2_2x/Geometry.c
branches/animsys-aligorith/source/blender/python/api2_2x/Geometry.h
branches/animsys-aligorith/source/blender/python/api2_2x/Group.c
branches/animsys-aligorith/source/blender/python/api2_2x/Group.h
branches/animsys-aligorith/source/blender/python/api2_2x/IDProp.c
branches/animsys-aligorith/source/blender/python/api2_2x/IDProp.h
branches/animsys-aligorith/source/blender/python/api2_2x/Image.c
branches/animsys-aligorith/source/blender/python/api2_2x/Image.h
branches/animsys-aligorith/source/blender/python/api2_2x/Ipo.c
branches/animsys-aligorith/source/blender/python/api2_2x/Ipo.h
branches/animsys-aligorith/source/blender/python/api2_2x/Ipocurve.c
branches/animsys-aligorith/source/blender/python/api2_2x/Ipocurve.h
branches/animsys-aligorith/source/blender/python/api2_2x/Key.c
branches/animsys-aligorith/source/blender/python/api2_2x/Key.h
branches/animsys-aligorith/source/blender/python/api2_2x/Lamp.c
branches/animsys-aligorith/source/blender/python/api2_2x/Lamp.h
branches/animsys-aligorith/source/blender/python/api2_2x/Lattice.c
branches/animsys-aligorith/source/blender/python/api2_2x/Lattice.h
branches/animsys-aligorith/source/blender/python/api2_2x/Library.c
branches/animsys-aligorith/source/blender/python/api2_2x/Library.h
branches/animsys-aligorith/source/blender/python/api2_2x/MTex.c
branches/animsys-aligorith/source/blender/python/api2_2x/MTex.h
branches/animsys-aligorith/source/blender/python/api2_2x/Material.c
branches/animsys-aligorith/source/blender/python/api2_2x/Material.h
branches/animsys-aligorith/source/blender/python/api2_2x/Mathutils.c
branches/animsys-aligorith/source/blender/python/api2_2x/Mathutils.h
branches/animsys-aligorith/source/blender/python/api2_2x/Mesh.c
branches/animsys-aligorith/source/blender/python/api2_2x/Mesh.h
branches/animsys-aligorith/source/blender/python/api2_2x/Metaball.c
branches/animsys-aligorith/source/blender/python/api2_2x/Metaball.h
branches/animsys-aligorith/source/blender/python/api2_2x/Modifier.c
branches/animsys-aligorith/source/blender/python/api2_2x/Modifier.h
branches/animsys-aligorith/source/blender/python/api2_2x/NLA.c
branches/animsys-aligorith/source/blender/python/api2_2x/NLA.h
branches/animsys-aligorith/source/blender/python/api2_2x/NMesh.c
branches/animsys-aligorith/source/blender/python/api2_2x/NMesh.h
branches/animsys-aligorith/source/blender/python/api2_2x/Noise.c
branches/animsys-aligorith/source/blender/python/api2_2x/Object.c
branches/animsys-aligorith/source/blender/python/api2_2x/Object.h
branches/animsys-aligorith/source/blender/python/api2_2x/Particle.c
branches/animsys-aligorith/source/blender/python/api2_2x/Particle.h
branches/animsys-aligorith/source/blender/python/api2_2x/Pose.c
branches/animsys-aligorith/source/blender/python/api2_2x/Pose.h
branches/animsys-aligorith/source/blender/python/api2_2x/Registry.c
branches/animsys-aligorith/source/blender/python/api2_2x/Registry.h
branches/animsys-aligorith/source/blender/python/api2_2x/Scene.c
branches/animsys-aligorith/source/blender/python/api2_2x/Scene.h
branches/animsys-aligorith/source/blender/python/api2_2x/Sound.c
branches/animsys-aligorith/source/blender/python/api2_2x/Sound.h
branches/animsys-aligorith/source/blender/python/api2_2x/SurfNurb.c
branches/animsys-aligorith/source/blender/python/api2_2x/SurfNurb.h
branches/animsys-aligorith/source/blender/python/api2_2x/Sys.c
branches/animsys-aligorith/source/blender/python/api2_2x/Sys.h
branches/animsys-aligorith/source/blender/python/api2_2x/Text.c
branches/animsys-aligorith/source/blender/python/api2_2x/Text.h
branches/animsys-aligorith/source/blender/python/api2_2x/Text3d.c
branches/animsys-aligorith/source/blender/python/api2_2x/Text3d.h
branches/animsys-aligorith/source/blender/python/api2_2x/Texture.c
branches/animsys-aligorith/source/blender/python/api2_2x/Texture.h
branches/animsys-aligorith/source/blender/python/api2_2x/Types.c
branches/animsys-aligorith/source/blender/python/api2_2x/Types.h
branches/animsys-aligorith/source/blender/python/api2_2x/Window.c
branches/animsys-aligorith/source/blender/python/api2_2x/Window.h
branches/animsys-aligorith/source/blender/python/api2_2x/World.c
branches/animsys-aligorith/source/blender/python/api2_2x/World.h
branches/animsys-aligorith/source/blender/python/api2_2x/bpy.c
branches/animsys-aligorith/source/blender/python/api2_2x/bpy.h
branches/animsys-aligorith/source/blender/python/api2_2x/bpy_config.c
branches/animsys-aligorith/source/blender/python/api2_2x/bpy_config.h
branches/animsys-aligorith/source/blender/python/api2_2x/bpy_data.c
branches/animsys-aligorith/source/blender/python/api2_2x/bpy_data.h
branches/animsys-aligorith/source/blender/python/api2_2x/charRGBA.c
branches/animsys-aligorith/source/blender/python/api2_2x/charRGBA.h
branches/animsys-aligorith/source/blender/python/api2_2x/constant.c
branches/animsys-aligorith/source/blender/python/api2_2x/constant.h
branches/animsys-aligorith/source/blender/python/api2_2x/doc/Modifier.py
branches/animsys-aligorith/source/blender/python/api2_2x/euler.c
branches/animsys-aligorith/source/blender/python/api2_2x/euler.h
branches/animsys-aligorith/source/blender/python/api2_2x/gen_library.c
branches/animsys-aligorith/source/blender/python/api2_2x/gen_library.h
branches/animsys-aligorith/source/blender/python/api2_2x/gen_utils.c
branches/animsys-aligorith/source/blender/python/api2_2x/gen_utils.h
branches/animsys-aligorith/source/blender/python/api2_2x/logic.c
branches/animsys-aligorith/source/blender/python/api2_2x/logic.h
branches/animsys-aligorith/source/blender/python/api2_2x/matrix.c
branches/animsys-aligorith/source/blender/python/api2_2x/matrix.h
branches/animsys-aligorith/source/blender/python/api2_2x/meshPrimitive.c
branches/animsys-aligorith/source/blender/python/api2_2x/meshPrimitive.h
branches/animsys-aligorith/source/blender/python/api2_2x/modules.h
branches/animsys-aligorith/source/blender/python/api2_2x/point.c
branches/animsys-aligorith/source/blender/python/api2_2x/point.h
branches/animsys-aligorith/source/blender/python/api2_2x/quat.c
branches/animsys-aligorith/source/blender/python/api2_2x/quat.h
branches/animsys-aligorith/source/blender/python/api2_2x/rgbTuple.c
branches/animsys-aligorith/source/blender/python/api2_2x/rgbTuple.h
branches/animsys-aligorith/source/blender/python/api2_2x/sceneRadio.c
branches/animsys-aligorith/source/blender/python/api2_2x/sceneRadio.h
branches/animsys-aligorith/source/blender/python/api2_2x/sceneRender.c
branches/animsys-aligorith/source/blender/python/api2_2x/sceneRender.h
branches/animsys-aligorith/source/blender/python/api2_2x/sceneSequence.c
branches/animsys-aligorith/source/blender/python/api2_2x/sceneSequence.h
branches/animsys-aligorith/source/blender/python/api2_2x/sceneTimeLine.c
branches/animsys-aligorith/source/blender/python/api2_2x/sceneTimeLine.h
branches/animsys-aligorith/source/blender/python/api2_2x/vector.c
branches/animsys-aligorith/source/blender/python/api2_2x/vector.h
branches/animsys-aligorith/source/blender/python/api2_2x/windowTheme.c
branches/animsys-aligorith/source/blender/python/api2_2x/windowTheme.h
branches/animsys-aligorith/source/blender/radiosity/intern/source/radfactors.c
branches/animsys-aligorith/source/blender/radiosity/intern/source/radrender.c
branches/animsys-aligorith/source/blender/render/extern/include/RE_raytrace.h
branches/animsys-aligorith/source/blender/render/extern/include/RE_shader_ext.h
branches/animsys-aligorith/source/blender/render/intern/include/render_types.h
branches/animsys-aligorith/source/blender/render/intern/include/rendercore.h
branches/animsys-aligorith/source/blender/render/intern/include/renderdatabase.h
branches/animsys-aligorith/source/blender/render/intern/include/shadbuf.h
branches/animsys-aligorith/source/blender/render/intern/include/shading.h
branches/animsys-aligorith/source/blender/render/intern/include/strand.h
branches/animsys-aligorith/source/blender/render/intern/include/zbuf.h
branches/animsys-aligorith/source/blender/render/intern/source/convertblender.c
branches/animsys-aligorith/source/blender/render/intern/source/envmap.c
branches/animsys-aligorith/source/blender/render/intern/source/imagetexture.c
branches/animsys-aligorith/source/blender/render/intern/source/rayshade.c
branches/animsys-aligorith/source/blender/render/intern/source/raytrace.c
branches/animsys-aligorith/source/blender/render/intern/source/rendercore.c
branches/animsys-aligorith/source/blender/render/intern/source/renderdatabase.c
branches/animsys-aligorith/source/blender/render/intern/source/shadbuf.c
branches/animsys-aligorith/source/blender/render/intern/source/shadeinput.c
branches/animsys-aligorith/source/blender/render/intern/source/shadeoutput.c
branches/animsys-aligorith/source/blender/render/intern/source/sss.c
branches/animsys-aligorith/source/blender/render/intern/source/strand.c
branches/animsys-aligorith/source/blender/render/intern/source/texture.c
branches/animsys-aligorith/source/blender/render/intern/source/zbuf.c
branches/animsys-aligorith/source/blender/src/buttons_editing.c
branches/animsys-aligorith/source/blender/src/buttons_object.c
branches/animsys-aligorith/source/blender/src/buttons_shading.c
branches/animsys-aligorith/source/blender/src/drawarmature.c
branches/animsys-aligorith/source/blender/src/drawimasel.c
branches/animsys-aligorith/source/blender/src/drawobject.c
branches/animsys-aligorith/source/blender/src/drawtext.c
branches/animsys-aligorith/source/blender/src/drawview.c
branches/animsys-aligorith/source/blender/src/edit.c
branches/animsys-aligorith/source/blender/src/editaction.c
branches/animsys-aligorith/source/blender/src/editarmature.c
branches/animsys-aligorith/source/blender/src/editcurve.c
branches/animsys-aligorith/source/blender/src/editimasel.c
branches/animsys-aligorith/source/blender/src/editlattice.c
branches/animsys-aligorith/source/blender/src/editnla.c
branches/animsys-aligorith/source/blender/src/editnode.c
branches/animsys-aligorith/source/blender/src/editobject.c
branches/animsys-aligorith/source/blender/src/editparticle.c
branches/animsys-aligorith/source/blender/src/editscreen.c
branches/animsys-aligorith/source/blender/src/editsound.c
branches/animsys-aligorith/source/blender/src/edittime.c
branches/animsys-aligorith/source/blender/src/editview.c
branches/animsys-aligorith/source/blender/src/filesel.c
branches/animsys-aligorith/source/blender/src/header_view3d.c
branches/animsys-aligorith/source/blender/src/interface.c
branches/animsys-aligorith/source/blender/src/language.c
branches/animsys-aligorith/source/blender/src/meshlaplacian.c
branches/animsys-aligorith/source/blender/src/meshtools.c
branches/animsys-aligorith/source/blender/src/poseobject.c
branches/animsys-aligorith/source/blender/src/retopo.c
branches/animsys-aligorith/source/blender/src/seqeffects.c
branches/animsys-aligorith/source/blender/src/space.c
branches/animsys-aligorith/source/blender/src/toolbox.c
branches/animsys-aligorith/source/blender/src/transform.c
branches/animsys-aligorith/source/blender/src/transform_conversions.c
branches/animsys-aligorith/source/blender/src/transform_manipulator.c
branches/animsys-aligorith/source/blender/src/transform_snap.c
branches/animsys-aligorith/source/blender/yafray/YafRay_Api.h
branches/animsys-aligorith/source/blender/yafray/intern/api.cpp
branches/animsys-aligorith/source/blender/yafray/intern/export_File.cpp
branches/animsys-aligorith/source/blender/yafray/intern/export_Plugin.cpp
branches/animsys-aligorith/source/blender/yafray/intern/yafray_Render.cpp
branches/animsys-aligorith/source/blender/yafray/intern/yafray_Render.h
branches/animsys-aligorith/source/nan_compile.mk
branches/animsys-aligorith/source/nan_definitions.mk
branches/animsys-aligorith/source/nan_link.mk
branches/animsys-aligorith/source/tools/guess/guessconfig
Added Paths:
-----------
branches/animsys-aligorith/source/blender/include/reeb.h
branches/animsys-aligorith/source/blender/src/reeb.c
Modified: branches/animsys-aligorith/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/animsys-aligorith/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-16 00:33:40 UTC (rev 12900)
@@ -291,20 +291,20 @@
if (fbuf) {
float *pixel, *max;
unsigned char c;
- int x, y;
+ int xi, yi;
max = fbuf + (4 * (w * h));
while ((c = (unsigned char) *str++)) {
BMF_CharData & cd = m_fontData->chars[c];
if (cd.data_offset != -1) {
- for (y = 0; y < cd.height; y++) {
- unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y];
- for (x = cd.xorig; x < cd.width; x++) {
- pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x));
+ for (yi = 0; yi < cd.height; yi++) {
+ unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi];
+ for (xi = cd.xorig; xi < cd.width; xi++) {
+ pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi));
if ((pixel < max) && (pixel > fbuf)) {
- int byteIdx = x/8;
- int bitIdx = 7 - (x%8);
+ int byteIdx = xi/8;
+ int bitIdx = 7 - (xi%8);
if (chrRow[byteIdx]&(1<<bitIdx)) {
pixel[0] = col[0];
Modified: branches/animsys-aligorith/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/animsys-aligorith/intern/elbeem/intern/isosurface.cpp 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/intern/elbeem/intern/isosurface.cpp 2007-12-16 00:33:40 UTC (rev 12900)
@@ -13,11 +13,10 @@
#include <algorithm>
#include <stdio.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
Modified: branches/animsys-aligorith/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- branches/animsys-aligorith/intern/elbeem/intern/solver_adap.cpp 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/intern/elbeem/intern/solver_adap.cpp 2007-12-16 00:33:40 UTC (rev 12900)
@@ -11,11 +11,10 @@
#include "solver_relax.h"
#include "particletracer.h"
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
/*****************************************************************************/
//! coarse step functions
/*****************************************************************************/
Modified: branches/animsys-aligorith/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/animsys-aligorith/intern/elbeem/intern/solver_main.cpp 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/intern/elbeem/intern/solver_main.cpp 2007-12-16 00:33:40 UTC (rev 12900)
@@ -13,7 +13,7 @@
#include "loop_tools.h"
#include <stdlib.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
Modified: branches/animsys-aligorith/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/animsys-aligorith/projectfiles_vc7/blender/blender.sln 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/projectfiles_vc7/blender/blender.sln 2007-12-16 00:33:40 UTC (rev 12900)
@@ -248,8 +248,6 @@
Debug = Debug
Release = Release
EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Release.ActiveCfg = Blender Release|Win32
Modified: branches/animsys-aligorith/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/animsys-aligorith/projectfiles_vc7/blender/src/BL_src.vcproj 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/projectfiles_vc7/blender/src/BL_src.vcproj 2007-12-16 00:33:40 UTC (rev 12900)
@@ -476,6 +476,9 @@
RelativePath="..\..\..\source\blender\src\prvicons.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\src\reeb.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\renderwin.c">
</File>
<File
@@ -888,6 +891,9 @@
RelativePath="..\..\..\source\blender\include\playanim_ext.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\include\reeb.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\transform.h">
</File>
<File
Modified: branches/animsys-aligorith/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/BKE_bad_level_calls.h 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/BKE_bad_level_calls.h 2007-12-16 00:33:40 UTC (rev 12900)
@@ -91,8 +91,9 @@
void mainqenter (unsigned short event, short val);
void waitcursor(int);
void allqueue(unsigned short event, short val);
-#define REDRAWVIEW3D 0x4010
-#define REDRAWBUTSEDIT 0x4019
+#define REDRAWVIEW3D 0x4010
+#define REDRAWBUTSOBJECT 0x4018
+#define REDRAWBUTSEDIT 0x4019
struct Material;
extern struct Material defmaterial;
Modified: branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h 2007-12-16 00:33:40 UTC (rev 12900)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 245
-#define BLENDER_SUBVERSION 11
+#define BLENDER_SUBVERSION 12
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h 2007-12-16 00:33:40 UTC (rev 12900)
@@ -63,7 +63,7 @@
void boundbox_mesh(struct Mesh *me, float *loc, float *size);
void tex_space_mesh(struct Mesh *me);
float *get_mesh_orco_verts(struct Object *ob);
-void transform_mesh_orco_verts(struct Mesh *me, float (*orco)[3], int totvert);
+void transform_mesh_orco_verts(struct Mesh *me, float (*orco)[3], int totvert, int invert);
void test_index_face(struct MFace *mface, struct CustomData *mfdata, int mfindex, int nr);
struct Mesh *get_mesh(struct Object *ob);
void set_mesh(struct Object *ob, struct Mesh *me);
Modified: branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c 2007-12-16 00:33:40 UTC (rev 12900)
@@ -1861,7 +1861,7 @@
else
orco= (float(*)[3])get_mesh_orco_verts(ob);
- transform_mesh_orco_verts(ob->data, orco, totvert);
+ transform_mesh_orco_verts(ob->data, orco, totvert, 0);
if((layerorco = DM_get_vert_data_layer(dm, CD_ORCO))) {
memcpy(layerorco, orco, sizeof(float)*totvert);
Modified: branches/animsys-aligorith/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/intern/anim.c 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/intern/anim.c 2007-12-16 00:33:40 UTC (rev 12900)
@@ -292,14 +292,6 @@
dob->index= index;
ob->lay= lay;
- /* allowing duplicators for particle systems... a bit silly still */
- {
- PartEff *paf= give_parteff(ob);
- if(paf) {
- Mat4Invert(ob->imat, ob->obmat);
- Mat4CpyMat4(paf->imat, ob->imat);
- }
- }
return dob;
}
@@ -809,7 +801,7 @@
group_duplilist(duplilist, ob, 0); /* now recursive */
- /* make copy already, because in group dupli's deform displists can be makde, requiring parent matrices */
+ /* make copy already, because in group dupli's deform displists can be made, requiring parent matrices */
for(dob= duplilist->first; dob; dob= dob->next)
Mat4CpyMat4(dob->ob->obmat, dob->mat);
}
Modified: branches/animsys-aligorith/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/intern/curve.c 2007-12-15 22:50:59 UTC (rev 12899)
+++ branches/animsys-aligorith/source/blender/blenkernel/intern/curve.c 2007-12-16 00:33:40 UTC (rev 12900)
@@ -1480,7 +1480,7 @@
while(nu) {
if(nu->pntsu<=1) {
- bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
+ bl= MEM_callocN(sizeof(BevList)+1*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
bl->nr= 0;
} else {
@@ -1490,8 +1490,7 @@
resolu= nu->resolu;
if((nu->type & 7)==CU_POLY) {
-
- len= nu->pntsu;
+
bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
@@ -1544,7 +1543,7 @@
bevp->z= prevbezt->vec[1][2];
bevp->alfa= prevbezt->alfa;
bevp->f1= SELECT;
- bevp->f2= SELECT;
+ bevp->f2= 0;
bevp++;
bl->nr++;
bl->flag= 1;
Modified: branches/animsys-aligorith/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/animsys-aligorith/source/blender/blenkernel/intern/depsgraph.c 2007-12-15 22:50:59 UTC (rev 12899)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list