[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12978] branches/pynodes: * svn merge r12863:12977 https://svn.blender.org/svnroot/bf-blender/trunk/ blender .
Nathan Letwory
jesterking at letwory.net
Sun Dec 23 12:47:46 CET 2007
Revision: 12978
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12978
Author: jesterking
Date: 2007-12-23 12:47:45 +0100 (Sun, 23 Dec 2007)
Log Message:
-----------
* svn merge r12863:12977 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
* Willian, hopefully this merge went ok, please do check :)
Modified Paths:
--------------
branches/pynodes/SConstruct
branches/pynodes/extern/ffmpeg/libswscale/swscale.c
branches/pynodes/extern/ffmpeg/patches/README
branches/pynodes/extern/verse/Makefile
branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/pynodes/intern/elbeem/intern/isosurface.cpp
branches/pynodes/intern/elbeem/intern/solver_adap.cpp
branches/pynodes/intern/elbeem/intern/solver_main.cpp
branches/pynodes/release/scripts/import_obj.py
branches/pynodes/source/blender/blenkernel/BKE_bad_level_calls.h
branches/pynodes/source/blender/blenkernel/BKE_modifier.h
branches/pynodes/source/blender/blenkernel/BKE_particle.h
branches/pynodes/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/pynodes/source/blender/blenkernel/intern/DerivedMesh.c
branches/pynodes/source/blender/blenkernel/intern/anim.c
branches/pynodes/source/blender/blenkernel/intern/curve.c
branches/pynodes/source/blender/blenkernel/intern/depsgraph.c
branches/pynodes/source/blender/blenkernel/intern/mesh.c
branches/pynodes/source/blender/blenkernel/intern/modifier.c
branches/pynodes/source/blender/blenkernel/intern/object.c
branches/pynodes/source/blender/blenkernel/intern/particle.c
branches/pynodes/source/blender/blenkernel/intern/particle_system.c
branches/pynodes/source/blender/blenlib/BLI_blenlib.h
branches/pynodes/source/blender/blenlib/BLI_boxpack2d.h
branches/pynodes/source/blender/blenlib/intern/util.c
branches/pynodes/source/blender/blenloader/intern/readfile.c
branches/pynodes/source/blender/blenloader/intern/writefile.c
branches/pynodes/source/blender/imbuf/intern/jpeg.c
branches/pynodes/source/blender/imbuf/intern/tiff.c
branches/pynodes/source/blender/include/BDR_sculptmode.h
branches/pynodes/source/blender/include/BIF_drawtext.h
branches/pynodes/source/blender/include/BIF_editarmature.h
branches/pynodes/source/blender/include/BIF_editparticle.h
branches/pynodes/source/blender/include/BIF_gl.h
branches/pynodes/source/blender/include/transform.h
branches/pynodes/source/blender/makesdna/DNA_action_types.h
branches/pynodes/source/blender/makesdna/DNA_constraint_types.h
branches/pynodes/source/blender/makesdna/DNA_material_types.h
branches/pynodes/source/blender/makesdna/DNA_object_types.h
branches/pynodes/source/blender/makesdna/DNA_particle_types.h
branches/pynodes/source/blender/makesdna/DNA_scene_types.h
branches/pynodes/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/pynodes/source/blender/python/api2_2x/Draw.c
branches/pynodes/source/blender/python/api2_2x/Geometry.c
branches/pynodes/source/blender/python/api2_2x/Key.c
branches/pynodes/source/blender/python/api2_2x/Mesh.c
branches/pynodes/source/blender/python/api2_2x/sceneSequence.c
branches/pynodes/source/blender/radiosity/intern/source/radfactors.c
branches/pynodes/source/blender/radiosity/intern/source/radrender.c
branches/pynodes/source/blender/render/extern/include/RE_raytrace.h
branches/pynodes/source/blender/render/extern/include/RE_shader_ext.h
branches/pynodes/source/blender/render/intern/include/render_types.h
branches/pynodes/source/blender/render/intern/include/rendercore.h
branches/pynodes/source/blender/render/intern/include/renderdatabase.h
branches/pynodes/source/blender/render/intern/include/shadbuf.h
branches/pynodes/source/blender/render/intern/include/shading.h
branches/pynodes/source/blender/render/intern/include/strand.h
branches/pynodes/source/blender/render/intern/include/zbuf.h
branches/pynodes/source/blender/render/intern/source/convertblender.c
branches/pynodes/source/blender/render/intern/source/envmap.c
branches/pynodes/source/blender/render/intern/source/imagetexture.c
branches/pynodes/source/blender/render/intern/source/pipeline.c
branches/pynodes/source/blender/render/intern/source/rayshade.c
branches/pynodes/source/blender/render/intern/source/raytrace.c
branches/pynodes/source/blender/render/intern/source/rendercore.c
branches/pynodes/source/blender/render/intern/source/renderdatabase.c
branches/pynodes/source/blender/render/intern/source/shadbuf.c
branches/pynodes/source/blender/render/intern/source/shadeinput.c
branches/pynodes/source/blender/render/intern/source/shadeoutput.c
branches/pynodes/source/blender/render/intern/source/strand.c
branches/pynodes/source/blender/render/intern/source/texture.c
branches/pynodes/source/blender/render/intern/source/zbuf.c
branches/pynodes/source/blender/src/buttons_editing.c
branches/pynodes/source/blender/src/buttons_object.c
branches/pynodes/source/blender/src/buttons_shading.c
branches/pynodes/source/blender/src/drawaction.c
branches/pynodes/source/blender/src/drawimage.c
branches/pynodes/source/blender/src/drawmesh.c
branches/pynodes/source/blender/src/drawobject.c
branches/pynodes/source/blender/src/drawseq.c
branches/pynodes/source/blender/src/drawtext.c
branches/pynodes/source/blender/src/drawview.c
branches/pynodes/source/blender/src/editaction.c
branches/pynodes/source/blender/src/editarmature.c
branches/pynodes/source/blender/src/editfont.c
branches/pynodes/source/blender/src/editmball.c
branches/pynodes/source/blender/src/editobject.c
branches/pynodes/source/blender/src/editparticle.c
branches/pynodes/source/blender/src/editscreen.c
branches/pynodes/source/blender/src/editseq.c
branches/pynodes/source/blender/src/header_action.c
branches/pynodes/source/blender/src/header_info.c
branches/pynodes/source/blender/src/header_text.c
branches/pynodes/source/blender/src/header_view3d.c
branches/pynodes/source/blender/src/headerbuttons.c
branches/pynodes/source/blender/src/language.c
branches/pynodes/source/blender/src/meshlaplacian.c
branches/pynodes/source/blender/src/poseobject.c
branches/pynodes/source/blender/src/retopo.c
branches/pynodes/source/blender/src/sculptmode.c
branches/pynodes/source/blender/src/space.c
branches/pynodes/source/blender/src/toets.c
branches/pynodes/source/blender/src/transform.c
branches/pynodes/source/blender/src/transform_conversions.c
branches/pynodes/source/blender/src/transform_generics.c
branches/pynodes/source/blender/src/transform_snap.c
branches/pynodes/source/blender/yafray/YafRay_Api.h
branches/pynodes/source/blender/yafray/intern/api.cpp
branches/pynodes/source/blender/yafray/intern/export_File.cpp
branches/pynodes/source/blender/yafray/intern/export_Plugin.cpp
branches/pynodes/source/blender/yafray/intern/yafray_Render.cpp
branches/pynodes/source/blender/yafray/intern/yafray_Render.h
branches/pynodes/source/nan_compile.mk
branches/pynodes/source/nan_definitions.mk
branches/pynodes/source/nan_link.mk
branches/pynodes/source/tools/guess/guessconfig
branches/pynodes/tools/btools.py
Added Paths:
-----------
branches/pynodes/extern/ffmpeg/patches/swscale_stride_bugfix.patch
branches/pynodes/source/blender/blenlib/BLI_bpath.h
branches/pynodes/source/blender/blenlib/intern/bpath.c
Removed Paths:
-------------
branches/pynodes/release/scripts/image_find_paths.py
Property Changed:
----------------
branches/pynodes/source/blender/python/api2_2x/doc/pupblock.blend
branches/pynodes/source/tools/guess/config.guess
branches/pynodes/source/tools/guess/guessconfig
Modified: branches/pynodes/SConstruct
===================================================================
--- branches/pynodes/SConstruct 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/SConstruct 2007-12-23 11:47:45 UTC (rev 12978)
@@ -170,6 +170,9 @@
opts = btools.read_opts(optfiles, B.arguments)
opts.Update(env)
+if not env['BF_FANCY']:
+ B.bc.disable()
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
Modified: branches/pynodes/extern/ffmpeg/libswscale/swscale.c
===================================================================
--- branches/pynodes/extern/ffmpeg/libswscale/swscale.c 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/extern/ffmpeg/libswscale/swscale.c 2007-12-23 11:47:45 UTC (rev 12978)
@@ -1678,7 +1678,7 @@
if(conv)
{
- if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
+ if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
else
{
Modified: branches/pynodes/extern/ffmpeg/patches/README
===================================================================
--- branches/pynodes/extern/ffmpeg/patches/README 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/extern/ffmpeg/patches/README 2007-12-23 11:47:45 UTC (rev 12978)
@@ -1,8 +1,8 @@
In this directory, I collect patches to FFMPEG, to make it
work / faster with blender.
-Currently, there is only a small MMX acceleration for the
-YUV -> BGRA32
-transformation.
+Currently:
+- MMX acceleration for the YUV -> BGRA32 transformation.
+- Bugfix for swscale, that screwed up RGB -> RGB32 with RAW AVIs
-- Peter
\ No newline at end of file
Copied: branches/pynodes/extern/ffmpeg/patches/swscale_stride_bugfix.patch (from rev 12977, trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch)
===================================================================
--- branches/pynodes/extern/ffmpeg/patches/swscale_stride_bugfix.patch (rev 0)
+++ branches/pynodes/extern/ffmpeg/patches/swscale_stride_bugfix.patch 2007-12-23 11:47:45 UTC (rev 12978)
@@ -0,0 +1,13 @@
+Index: swscale.c
+===================================================================
+--- swscale.c (revision 12850)
++++ swscale.c (working copy)
+@@ -1678,7 +1678,7 @@
+
+ if(conv)
+ {
+- if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
++ if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
+ conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+ else
+ {
Modified: branches/pynodes/extern/verse/Makefile
===================================================================
--- branches/pynodes/extern/verse/Makefile 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/extern/verse/Makefile 2007-12-23 11:47:45 UTC (rev 12978)
@@ -54,5 +54,5 @@
ifeq ($(OS),darwin)
ranlib $(NAN_VERSE)/lib/libverse.a
endif
- $(CCC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
@$(CP) $(DIR)/verse$(EXT) $(OCGDIR)/bin
Modified: branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-23 11:47:45 UTC (rev 12978)
@@ -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/pynodes/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/pynodes/intern/elbeem/intern/isosurface.cpp 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/intern/elbeem/intern/isosurface.cpp 2007-12-23 11:47:45 UTC (rev 12978)
@@ -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/pynodes/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- branches/pynodes/intern/elbeem/intern/solver_adap.cpp 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/intern/elbeem/intern/solver_adap.cpp 2007-12-23 11:47:45 UTC (rev 12978)
@@ -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/pynodes/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/pynodes/intern/elbeem/intern/solver_main.cpp 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/intern/elbeem/intern/solver_main.cpp 2007-12-23 11:47:45 UTC (rev 12978)
@@ -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
Deleted: branches/pynodes/release/scripts/image_find_paths.py
===================================================================
--- branches/pynodes/release/scripts/image_find_paths.py 2007-12-23 03:03:54 UTC (rev 12977)
+++ branches/pynodes/release/scripts/image_find_paths.py 2007-12-23 11:47:45 UTC (rev 12978)
@@ -1,167 +0,0 @@
-#!BPY
-
-"""
-Name: 'Fix Broken Paths'
-Blender: 242
-Group: 'Image'
-Tooltip: 'Search for new image paths to make relative links to'
-"""
-
-__author__ = "Campbell Barton AKA Ideasman"
-__url__ = ["blenderartist.org"]
-
-__bpydoc__ = """\
-Find image target paths
-
-This script searches for images whos
-file paths do not point to an existing image file,
-all image paths are made relative where possible.
-usefull when moving projects between computers, when absolute paths links are broken.
-"""
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# Script copyright (C) Campbell J Barton
-#
-# 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.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-
-from Blender import *
-
-try:
- import os
-except:
- Draw.PupMenu('You need a full python install to use this script')
- os= None
-
-
-#==============================================#
-# Strips the slashes from the back of a string #
-#==============================================#
-def stripPath(path):
- return path.split('/')[-1].split('\\')[-1]
-
-# finds the file starting at the root.
-def findImage(findRoot, imagePath):
- newImageFile = None
-
- imageFile = imagePath.split('/')[-1].split('\\')[-1]
-
- # ROOT, DIRS, FILES
- pathWalk = os.walk(findRoot)
- pathList = [True]
-
- matchList = [] # Store a list of (match, size), choose the biggest.
- while True:
- try:
- pathList = pathWalk.next()
- except:
- break
-
- for file in pathList[2]:
- # FOUND A MATCH
- if file.lower() == imageFile.lower():
- name = pathList[0] + sys.sep + file
- try:
- size = os.path.getsize(name)
- except:
- size = 0
-
- if size:
- print ' found:', name
- matchList.append( (name, size) )
-
- if matchList == []:
- print 'no match for:', imageFile
- return None
- else:
- # Sort by file size
- matchList.sort(lambda A, B: cmp(B[1], A[1]) )
-
- print 'using:', matchList[0][0]
- # First item is the largest
- return matchList[0][0] # 0 - first, 0 - pathname
-
-
-# Makes the pathe relative to the blend file path.
-def makeRelative(path, blendBasePath):
- if path.startswith(blendBasePath):
- path = path.replace(blendBasePath, '//')
- path = path.replace('//\\', '//')
- return path
-
-def find_images(findRoot):
- print findRoot
-
- # findRoot = Draw.PupStrInput ('find in: ', '', 100)
-
- if findRoot == '':
- Draw.PupMenu('No Directory Selected')
- return
-
- # Account for //
- findRoot = sys.expandpath(findRoot)
-
- # Strip filename
- while findRoot[-1] != '/' and findRoot[-1] != '\\':
- findRoot = findRoot[:-1]
-
-
- if not findRoot.endswith(sys.sep):
- findRoot += sys.sep
-
-
- if findRoot != '/' and not sys.exists(findRoot[:-1]):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list