[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36555] branches/bmesh/blender: copied across changes which were missed by merging.

Mon May 9 04:45:52 CEST 2011

Revision: 36555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36555
Author:   campbellbarton
Date:     2011-05-09 02:45:52 +0000 (Mon, 09 May 2011)
Log Message:
-----------
copied across changes which were missed by merging.

Modified Paths:
--------------
    branches/bmesh/blender/build_files/cmake/example_scripts/make_quicky.py
    branches/bmesh/blender/extern/libopenjpeg/CMakeLists.txt
    branches/bmesh/blender/intern/decimation/SConscript
    branches/bmesh/blender/intern/guardedalloc/SConscript
    branches/bmesh/blender/intern/itasc/kdl/frameacc.hpp
    branches/bmesh/blender/intern/opennl/superlu/sgstrf.c
    branches/bmesh/blender/intern/string/SConscript
    branches/bmesh/blender/release/scripts/presets/interaction/maya.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
    branches/bmesh/blender/source/blender/editors/armature/poseobject.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/mesh/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/object/object_add.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c
    branches/bmesh/blender/source/blender/editors/object/object_transform.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/gpu/GPU_material.h
    branches/bmesh/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/bmesh/blender/source/blender/makesdna/intern/SConscript
    branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
    branches/bmesh/blender/source/blender/makesrna/intern/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
    branches/bmesh/blender/source/blender/python/simple_enum_gen.py
    branches/bmesh/blender/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/bmesh/blender/source/blender/render/intern/raytrace/reorganize.h
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
    branches/bmesh/blender/source/blender/render/intern/source/pointdensity.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
    branches/bmesh/blender/source/blender/windowmanager/CMakeLists.txt
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
    branches/bmesh/blender/source/creator/CMakeLists.txt
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/Ketsji/SConscript
    branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
    branches/bmesh/blender/source/tools/MakeCursor.py

Added Paths:
-----------
    branches/bmesh/blender/intern/container/CTR_HashedPtr.h
    branches/bmesh/blender/release/windows/installer/01.installer.bmp

Removed Paths:
-------------
    branches/bmesh/blender/doc/BL-license.txt
    branches/bmesh/blender/doc/bf-members.txt
    branches/bmesh/blender/doc/blender.1
    branches/bmesh/blender/intern/SoundSystem/
    branches/bmesh/blender/intern/elbeem/intern/elbeem.h
    branches/bmesh/blender/release/plugins/sequence/Makefile
    branches/bmesh/blender/release/scripts/export_cal3d.py
    branches/bmesh/blender/release/scripts/modules/bpy/app.py
    branches/bmesh/blender/release/scripts/modules/bpy_ops.py
    branches/bmesh/blender/release/scripts/modules/dynamic_menu.py
    branches/bmesh/blender/release/scripts/op/
    branches/bmesh/blender/release/scripts/templates/operator.py
    branches/bmesh/blender/release/scripts/uv_from_adjacent.py
    branches/bmesh/blender/release/text/release_244.txt
    branches/bmesh/blender/source/blender/editors/screen/Makefile
    branches/bmesh/blender/source/blender/editors/space_file/Makefile
    branches/bmesh/blender/source/blender/editors/space_image/Makefile
    branches/bmesh/blender/source/blender/editors/space_info/Makefile
    branches/bmesh/blender/source/blender/python/BPY_menus.c
    branches/bmesh/blender/source/blender/python/BPY_menus.h
    branches/bmesh/blender/source/blender/python/Makefile
    branches/bmesh/blender/source/blender/python/epy_doc_gen.py
    branches/bmesh/blender/source/blender/python/intern/Makefile
    branches/bmesh/blender/source/blender/python/intern/bpy_ui.c
    branches/bmesh/blender/source/blender/python/intern/bpy_ui.h

Modified: branches/bmesh/blender/build_files/cmake/example_scripts/make_quicky.py
===================================================================

--- branches/bmesh/blender/build_files/cmake/example_scripts/make_quicky.py	2011-05-09 02:44:07 UTC (rev 36554)
+++ branches/bmesh/blender/build_files/cmake/example_scripts/make_quicky.py	2011-05-09 02:45:52 UTC (rev 36555)
@@ -20,6 +20,7 @@
 
 # <pep8 compliant>
 
+
 def print_help(targets):
     print("CMake quicky wrapper, no valid targets given.")
     print(" * targets can contain a subset of the full target name.")
@@ -36,11 +37,11 @@
     for t in targets:
         print("    %s" % t)
     print("...exiting")
-    
 
+
 def main():
     targets = set()
-    
+
     # collect targets
     makefile = open("Makefile", "r")
     for line in makefile:
@@ -54,13 +55,12 @@
 
         line = line.split(":", 1)[0]
 
-        if "/" in line: # cmake terget options, dont need these
+        if "/" in line:  # cmake terget options, dont need these
             continue
 
         targets.add(line)
     makefile.close()
 
-
     # remove cmake targets
     bad = set([
         "help",
@@ -75,10 +75,9 @@
         "depend",
         "cmake_check_build_system",
         ])
-        
+
     targets -= set(bad)
 
-
     # parse args
     targets = list(targets)
     targets.sort()
@@ -106,7 +105,7 @@
                     print("    %s" % t)
                 print("...aborting.")
                 return
-    
+
     # execute
     cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
     print("cmake building with targets: %s" % " ".join(targets_new))

Deleted: branches/bmesh/blender/doc/BL-license.txt
===================================================================
--- branches/bmesh/blender/doc/BL-license.txt	2011-05-09 02:44:07 UTC (rev 36554)
+++ branches/bmesh/blender/doc/BL-license.txt	2011-05-09 02:45:52 UTC (rev 36555)
@@ -1,35 +0,0 @@
-Blender License (the "BL", see http://www.blender.org/BL/ ).
-
-Copyright (C) 2002-2005 Blender Foundation. All Rights Reserved.
-
-This text supersedes the previous BL description, called Blender License 1.0.
-
-When the Blender source code was released in 2002, the Blender Foundation reserved 
-the right to offer licenses outside of the GNU GPL. This so-called "dual license" 
-model was chosen to provide potential revenues for the Blender Foundation. 
-
-The BL has not been activated yet. Partially because;
-
-- there has to be a clear benefit for Blender itself and its community of 
-  developers and users.
-- the developers who have copyrighted additions to the source code need to approve 
-  the decision.
-- the (c) holder NaN Holding has to approve on a standard License Contract
-
-But most important; 
-
-- the Blender Foundation is financially healthy, based on community support
-  (e-shop sales), sponsoring and subsidy grants
-- current focus for the Blender Foundation is to not set up any commercial
-  activity related to Blender development.
-- the GNU GPL provides sufficient freedom for third parties to conduct business
-  with Blender
-
-For these reasons we've decided to cancel the BL offering for an indefinite period.
-
-Third parties interested to discuss usage or exploitation of Blender can email 
-license at blender.org for further information.
-
-Ton Roosendaal
-Chairman Blender Foundation.
-June 2005

Deleted: branches/bmesh/blender/doc/bf-members.txt
===================================================================
--- branches/bmesh/blender/doc/bf-members.txt	2011-05-09 02:44:07 UTC (rev 36554)
+++ branches/bmesh/blender/doc/bf-members.txt	2011-05-09 02:45:52 UTC (rev 36555)
@@ -1,1393 +0,0 @@
-Blender Foundation Members 
-
-Special thanks to the following people, who have supported the Blender Foundation
-by donating at least USD 50 to pay for opening the Blender sources: 
-(in chronological order):
-
-Bradley Keyes 
-Robert Knop 
-Thomas Brown 
-Adam Goodenough 
-Steven Tally 
-Jason Tally 
-Alan Taylor 
-Pascal COMPAGNON 
-Christopher Koppler 
-Matthew P. Carter
-Gideon Vaala 
-F.O. Bossert 
-Frank Mayhar 
-Peter Volgyesi 
-Mark E. Nelmes
-Peter Lammers 
-Craig Maloney 
-daniel e vertseegh
-Freek Zijlmans 
-Anthony Ogden 
-Anders Dys 
-Gerald Saunders 
-Fernando Cordas 
-Joshua Smith 
-Max R. Huskins
-imarend
-Olaf Arnold 
-Eric Van Hensbergen
-Christian Reichlin 
-brian moore 
-Anthony Walker 
-Carsten H\x9Afer 
-Raymond Fordham 
-David Megginson 
-Jason Schmidt 
-Christopher Walden 
-Robert van Straten
-Daniel Schwartz 
-ekzakt
-Jellybean
-Streit Eric 
-Bob Ippolito 
-Keith Frederick 
-Ryan Heimbuch 
-Martin Hess 
-Shigeo Yoshida 
-Rens Houben 
-Jun IIO 
-Derek Gladding 
-Adam Wendt 
-Habib Loew 
-Jani Turkia 
-Warren Landon 
-Chip Lynch 
-Hans Ruedisueli 
-Keith Jones 
-Eugenio Mario Longo
-Philippe Tanguay 
-nekurai
-Ricardo Kustner 
-Peter Van Loock
-Jun-ichi OKAMURA 
-alain dejoux 
-dario trombino 
-Kenneth Johansson 
-Felix Schwarz 
-Eugenio Diaz 
-Aoki Katsutoshi 
-Norman J. Harman Jr. 
-Ralf Habel 
-Ken Payne 
-DEBEUX Sylvain 
-Douglas Philips 
-Lai Che Hung
-Johan Bolmsj\x9A 
-Aaron Mitchell 
-Teinye Horsfall 
-Martin Marbach 
-Jason Poole 
-Cesar Delgado 
-Gareth Clay 
-Paul Wasserman 
-Joeri Sebrechts 
-Johannes Lehtinen 
-Marcio L. Teixeira
-James A. Peltier
-George E. Nimmer III 
-Matthew Fite 
-Ken Sedgwick 
-Gary Baltzell 
-lukas schroeder 
-Dan Lyke 
-Mark Thorpe 
-A.D. Arul Nirai Selvan 
-Herbert P\x9Atzl 
-Andy Payne 
-LAFFITTE Benoit (KenjForce)
-James Ertle 
-Tom Turelinckx 
-Rigo Ketelings 
-Bryan Green 
-Suzuki Akihiro 
-Mason Staugler 
-Guillaume Randon 
-francois Gombault 
-Harald Thelen 
-Graziano Roccon 
-Jonathan DuBois 
-Jason Luros 
-Drew M. Snyder
-Jesse DeFer 
-Michael Keith 
-Gaetano Tinat 
-Ferris McCormick 
-Sherman Boyd 
-Thomas C Anth Jr 
-Joseph Catto 
-Damian Soto 
-John Walsh 
-Stephen Rosman 
-Ross Hopkins 
-Robert Wenzlaff 
-Joe Galat 
-LinuxFrench.NET
-Thomas Erichsen 
-Gary E. Deschaines
-Denis McCarthy 
-Michael Dowman 
-John (J5) Palmieri
-alphawolf
-Peter Paul Fink
-Charles F. McKnight
-Avi Schwartz 
-Jim Witte 
-Jens Ansorg 
-William Bate 
-Ron Romano 
-Marc Schraffenberger 
-Steve Thompson 
-Martin Whitaker 
-Kendall Dugger 
-Brice Due 
-Simon Vogl 
-Bernd Koestler 
-cl\x8Ement CORDIER 
-CreationAnimation.com
-Pete Carss 
-HERSEN Antoine 
-Charles R. Tersteeg
-James T Burnett
-Shawn Legrand 
-David Choice 
-patrick amaru 
-David Eck 
-Gabriel Welsche 
-Henning von Zitzewitz
-Chris Impink 
-Den Giles 
-Jon Cisewski 
-Ricki Myers 
-Luis Collado 
-Robert G. Watkins
-Rainer Perl 
-YAGI, Toshiki 
-Bruno Nitrosso 
-Athalyba / Blender Brasil 
-Dave Whittington 
-Darryl Luscombe 
-Benjamin A Moore
-Andreas Kollegger 
-Stamatis Logos 
-Ray Kelm 
-Albrecht Jacobs 
-Mirko Horstmann 
-Ranjit Mathew 
-Jaron Blackburn 
-Antonio Hui 
-Scott Moore 
-CSN media 
-Scott Carle 
-Ted Milker 
-Lars Brinkhoff 
-Louise Edwards 
-Alex Ruano 
-Art Rozenbaum 
-Manuel Hossfeld 
-Brandon Ehle 
-Lou Bruce 
-ROMASZEWSKI
-cadic jean-yves 
-Ralf Pietersz 
-KAZY
-serge Jadot 
-Herv\x8E LOUINET 
-Tom Houtman 
-Magnus K\x9A\x9Ahler 
-Martin Sinnaeve 
-Kevin Yank 
-Tomoichi Iriyama 
-THIBAULT
-Dr Steven J. Baines 
-Hans-Peter Berger 
-Jeffrey D. Holland
-Philip XP Talbot
-Peter Haight 
-Krister Bruhwel 
-the Smoos 
-Hohenegger Michael 
-Alejandro Gabriel y Galan 
-Boyer
-Alwin Eilers 
-Tyberghein Jorrit 
-Jaroslav Benkovsky 
-Gianluigi Belli 
-Naoki Abe 
-NOTTE Jean-Pierre 
-Jack Way 
-Bj\x9Arn Westlin 
-Mitch Magee 
-wizoptic
-Jake Edge 
-David Hoover 
-Xabier Go\x96i 
-Daniel Fort 
-Erik Noteboom 
-Pavel Vostatek 
-Javier Belanche Alonso
-Jeffrey Blank 
-Nathan Ryan 
-Peter Wrangell 
-Josef Sie\xA7 
-Timm Krumnack 
-Steve Martin 
-Shigeru Matsumoto 
-Marko Kohtala 
-Aleix Conchillo 
-Curtis Smith 
-Tatjana Svizensky 
-Matt Graham 
-Karo Launonen 
-Nikolaj Brandt Jensen
-Jean-Michel Smith 
-Nathan Clegg 
-Joaquim Carvalho 
-Bomholt
-Martin Imobersteg 
-Jordan
-Justin Warwick 
-barussaud
-Eric Molbert 
-Ben Berck 
-Jacco van Beek
-Dominic Agoro-Ombaka 
-Colin Foster 
-Sascha Adler 
-Stuart Duncan 
-Brendon Smith 
-S\x8Ebastien COLLETTE 
-Clemens Auer 
-Kay Fricke 
-Fabian Fagerholm 
-Norman Lin 
-Aaron Digulla 
-Camilo Moreno 
-Detlev Reppin 
-Denis NICOLAS 
-Armin Antons 
-Darren Heighington 
-Mario Latronico 
-Frank Meier 
-Joerg Frochte 
-Matthew Ingle 
-Anters
-Bjoern C. Schaefer
-STEMax
-Jeff Cox 
-Trevor Ratliff 
-Matt Henley 
-Fran\x8Dois VALETTE 
-Rob Saunders 
-Mike Luethi 
-Rami Aubourg-Kaires 
-Matthew Thomas 
-Allan Jacobsen 
-Adam Lowe 
-David Hostetler 
-Lo\x95c Vigneras 
-Dan Reiland 
-Pedro D\x92az del Arco 
-Pierre Beyssac 
-Chris Davey 
-YOSHIAKI Nishino 
-Cyber Perk 
-Fabrizio Cali 
-Harunobu Yoda 
-Gerrit Jan Baarda
-LarstiQ
-Ico Doornekamp 
-Emiel den Biesen
-Willem Zwarthoed 
-Carl Giesberts 
-Buzz
-lieve vanderschaeve 
-Margreet de Brie
-hans verwaal 
-Saskia van Dijk
-Martin Gosch 
-Alexander Konopka 
-Thomas Gebert 
-Gerard de Vries
-Hans Lambermont 
-Kim Beumer 
-Kay Thust 
-Alexander Jung 
-Tony Corlett 
-Olivier Thouverey 
-Hideo Nomoto 
-Giel Peters 
-Ray Poynter 
-Edoardo Galvagno 
-Pim Feijen 
-Hua-lun Li 
-William Reynish 
-Bryan Carpenter 
-Jim Scott 
-NGUYEN Fabien 
-Dave Stone 
-Andy Kugyelka 
-Andrew Ross 
-MerieJean-Christophe
-Marko Mestrovic 
-Jack
-Lars Gunnar West
-Wile E. Coyote
-Rick Clark 
-Carlos A. Duque
-Franck Barnier 
-Matt Shirley 
-Viktor Zacek 
-Peter Williamson 
-Chema Celorio 
-Paul Cleveland 
-Guo-Rong Koh 
-Andrew Potter 
-Daniel Smeltzer 
-Cativo
-Dmitri Bichko 
-Jeremy Brinkley 
-Stephen Saville 
-Michael Proto 
-Kurt Korbatits 
-Ruan Muller 
-Mike Beggs 
-Beat Schiess 
-Sven Marcel Buchholz
-Enrique Monfort 
-Simon Posnjak 
-Steven Ahkim 
-theGyre
-William Marble 
-Allen Smith 
-Joshua SS Miller
-Mike Edwards (PinkFreud)
-Mark D. Butala
-Auriea Harvey&Michael Samyn
-Randy Newman 
-Leslie Spring 
-Marc Schefer 
-Dean Edmonds 
-David Whitehouse 
-Tim Humphrey 
-Phillip Richdale 
-Jason McHugh 
-Claudio de Sario
-Artur Kedzierski 
-Richard Garcia 
-Isaac Rivas Alvarez
-Kiernan Holland 
-Holger Malessa 
-Masanori Okuda 
-Andrea Maracci 
-Kai-Peter B\x8Ackman 
-Gregg Patton 
-Luis M Ibarra
-Julian Green 
-Christian Bender 
-Mark Winkelman 
-Ebbe L. Nielsen
-Carlos Orozco 
-magnetHead
-Kr\x9Fckel Oliver 
-Thomas Ingham 
-Wes Devauld 
-Uwe Steinmann 
-Jesus Gonzalez 
-DenMeridiS
-Marc Hofer 
-Marko Mestrovic 
-Leslie Owen Everett
-Knut Bueltemann 
-Eric Garaventa 
-Wolfram Schwenzer 
-Edwin Brouwer 
-mauro ujetto 
-Franck Vibert 
-Daniel Pacheco 
-Justin Shumaker 
-Steve Wallace 
-Forensic Engineering Inc.
-Steve Mackay 
-NDNWarrior
-Christopher Gray 
-Darius Clarke (Socinian)
-Jean-S\x8Ebastien SEVESTRE 
-Douglas Fellows 
-Craig Symons 
-Quincin Gonjon 
-Brian B. Kelley

@@ Diff output truncated at 10240 characters. @@

