[Bf-blender-cvs] [02ff143f609] blender-v2.83-release: Steam Release: Script creation of Steam build files

[Nathan Letwory]

Commit: 02ff143f60977c2175b86fddb649a8c4c7787f84
Author: Nathan Letwory
Date:   Wed Dec 16 11:12:51 2020 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rB02ff143f60977c2175b86fddb649a8c4c7787f84

Steam Release: Script creation of Steam build files

Script tool for automation of Steam build files for tasks like {T77348}

This script automates creation of the Steam files: download of the archives,
extraction of the archives, preparation of the build scripts (VDF files), actual
building of the Steam game files.

Requirements


* MacOS machine - Tested on Catalina 10.15.6. Extracting contents from the DMG
  archive did not work Windows nor on Linux using 7-zip. All DMG archives tested
  failed to be extracted. As such only MacOS is known to work.
* Steam SDK downloaded from SteamWorks - The `steamcmd` is used to generate the
  Steam game files. The path to the `steamcmd` is what is actually needed.
* SteamWorks credentials - Needed to log in using `steamcmd`.
* Login to SteamWorks with the `steamcmd` from the command-line at least once -
  Needded to ensure the user is properly logged in. On a new machine the user
  will have to go through two-factor authentication.
* App ID and Depot IDs - Needed to create the VDF files.
* Python 3.x - 3.7 was tested.
* Base URL - for downloading the archives.

Reviewed By: Jeroen Bakker

Differential Revision: https://developer.blender.org/D8429

===

A   release/steam/README.md
A   release/steam/blender_app_build.vdf.template
A   release/steam/create_steam_builds.py
A   release/steam/depot_build_linux.vdf.template
A   release/steam/depot_build_macos.vdf.template
A   release/steam/depot_build_win.vdf.template

===

diff --git a/release/steam/README.md b/release/steam/README.md
new file mode 100644
index 000..05eda799c3f
--- /dev/null
+++ b/release/steam/README.md
@@ -0,0 +1,70 @@
+Creating Steam builds for Blender
+=
+
+This script automates creation of the Steam files: download of the archives,
+extraction of the archives, preparation of the build scripts (VDF files), 
actual
+building of the Steam game files.
+
+Requirements
+
+
+* MacOS machine - Tested on Catalina 10.15.6. Extracting contents from the DMG
+  archive did not work Windows nor on Linux using 7-zip. All DMG archives 
tested
+  failed to be extracted. As such only MacOS is known to work.
+* Steam SDK downloaded from SteamWorks - The `steamcmd` is used to generate the
+  Steam game files. The path to the `steamcmd` is what is actually needed.
+* SteamWorks credentials - Needed to log in using `steamcmd`.
+* Login to SteamWorks with the `steamcmd` from the command-line at least once -
+  Needded to ensure the user is properly logged in. On a new machine the user
+  will have to go through two-factor authentication.
+* App ID and Depot IDs - Needed to create the VDF files.
+* Python 3.x - 3.7 was tested.
+* Base URL - for downloading the archives.
+
+Usage
+=
+
+```bash
+$ export STEAMUSER=SteamUserName
+$ export STEAMPW=SteamUserPW
+$ export BASEURL=https://download.blender.org/release/Blender2.83/
+$ export VERSION=2.83.3
+$ export APPID=appidnr
+$ export WINID=winidnr
+$ export LINID=linuxidnr
+$ export MACOSID=macosidnr
+
+# log in to SteamWorks from command-line at least once
+
+$ ../sdk/tools/ContentBuilder/builder_osx/steamcmd +login $STEAMUSER $STEAMPW
+
+# once that has been done we can now actually start our tool
+
+$ python3.7 create_steam_builds.py --baseurl $BASEURL --version $VERSION 
--appid $APPID --winid $WINID --linuxid $LINID --macosid $MACOSID --steamuser 
$STEAMUSER --steampw $STEAMPW --steamcmd 
../sdk/tools/ContentBuilder/builder_osx/steamcmd
+```
+
+All arguments in the above example are required.
+
+At the start the tool will login using `steamcmd`. This is necessary to let the
+Steam SDK update itself if necessary.
+
+There are a few optional arguments:
+
+* `--dryrun`: If set building the game files will not actually happen. A set of
+  log files and a preview manifest per depot will be created in the output 
folder.
+  This can be used to double-check everything works as expected.
+* `--skipdl`: If set will skip downloading of the archives. The tool expects 
the
+  archives to already exist in the correct content location.
+* `--skipextract`: If set will skip extraction of all archives. The tool 
expects
+  the archives to already have been correctly extracted in the content 
location.
+
+Run the tool with `-h` for detailed information on each argument.
+
+The content and output folders are generated through appending the version
+without dots to the words `content` and `output` respectively, e.g. 
`content2833`
+and `output2833`. These folders are created next to the tool.
+
+From all `.template` files the Steam build scripts will be generated

[Bf-blender-cvs] [975ca919391] master: Steam Release: Script creation of Steam build files

[Nathan Letwory]

Commit: 975ca9193913c034f864121597e044d6eb043a5f
Author: Nathan Letwory
Date:   Wed Dec 16 11:12:51 2020 +0100
Branches: master
https://developer.blender.org/rB975ca9193913c034f864121597e044d6eb043a5f

Steam Release: Script creation of Steam build files

Script tool for automation of Steam build files for tasks like {T77348}

This script automates creation of the Steam files: download of the archives,
extraction of the archives, preparation of the build scripts (VDF files), actual
building of the Steam game files.

Requirements


* MacOS machine - Tested on Catalina 10.15.6. Extracting contents from the DMG
  archive did not work Windows nor on Linux using 7-zip. All DMG archives tested
  failed to be extracted. As such only MacOS is known to work.
* Steam SDK downloaded from SteamWorks - The `steamcmd` is used to generate the
  Steam game files. The path to the `steamcmd` is what is actually needed.
* SteamWorks credentials - Needed to log in using `steamcmd`.
* Login to SteamWorks with the `steamcmd` from the command-line at least once -
  Needded to ensure the user is properly logged in. On a new machine the user
  will have to go through two-factor authentication.
* App ID and Depot IDs - Needed to create the VDF files.
* Python 3.x - 3.7 was tested.
* Base URL - for downloading the archives.

Reviewed By: Jeroen Bakker

Differential Revision: https://developer.blender.org/D8429

===

A   release/steam/README.md
A   release/steam/blender_app_build.vdf.template
A   release/steam/create_steam_builds.py
A   release/steam/depot_build_linux.vdf.template
A   release/steam/depot_build_macos.vdf.template
A   release/steam/depot_build_win.vdf.template

===

diff --git a/release/steam/README.md b/release/steam/README.md
new file mode 100644
index 000..05eda799c3f
--- /dev/null
+++ b/release/steam/README.md
@@ -0,0 +1,70 @@
+Creating Steam builds for Blender
+=
+
+This script automates creation of the Steam files: download of the archives,
+extraction of the archives, preparation of the build scripts (VDF files), 
actual
+building of the Steam game files.
+
+Requirements
+
+
+* MacOS machine - Tested on Catalina 10.15.6. Extracting contents from the DMG
+  archive did not work Windows nor on Linux using 7-zip. All DMG archives 
tested
+  failed to be extracted. As such only MacOS is known to work.
+* Steam SDK downloaded from SteamWorks - The `steamcmd` is used to generate the
+  Steam game files. The path to the `steamcmd` is what is actually needed.
+* SteamWorks credentials - Needed to log in using `steamcmd`.
+* Login to SteamWorks with the `steamcmd` from the command-line at least once -
+  Needded to ensure the user is properly logged in. On a new machine the user
+  will have to go through two-factor authentication.
+* App ID and Depot IDs - Needed to create the VDF files.
+* Python 3.x - 3.7 was tested.
+* Base URL - for downloading the archives.
+
+Usage
+=
+
+```bash
+$ export STEAMUSER=SteamUserName
+$ export STEAMPW=SteamUserPW
+$ export BASEURL=https://download.blender.org/release/Blender2.83/
+$ export VERSION=2.83.3
+$ export APPID=appidnr
+$ export WINID=winidnr
+$ export LINID=linuxidnr
+$ export MACOSID=macosidnr
+
+# log in to SteamWorks from command-line at least once
+
+$ ../sdk/tools/ContentBuilder/builder_osx/steamcmd +login $STEAMUSER $STEAMPW
+
+# once that has been done we can now actually start our tool
+
+$ python3.7 create_steam_builds.py --baseurl $BASEURL --version $VERSION 
--appid $APPID --winid $WINID --linuxid $LINID --macosid $MACOSID --steamuser 
$STEAMUSER --steampw $STEAMPW --steamcmd 
../sdk/tools/ContentBuilder/builder_osx/steamcmd
+```
+
+All arguments in the above example are required.
+
+At the start the tool will login using `steamcmd`. This is necessary to let the
+Steam SDK update itself if necessary.
+
+There are a few optional arguments:
+
+* `--dryrun`: If set building the game files will not actually happen. A set of
+  log files and a preview manifest per depot will be created in the output 
folder.
+  This can be used to double-check everything works as expected.
+* `--skipdl`: If set will skip downloading of the archives. The tool expects 
the
+  archives to already exist in the correct content location.
+* `--skipextract`: If set will skip extraction of all archives. The tool 
expects
+  the archives to already have been correctly extracted in the content 
location.
+
+Run the tool with `-h` for detailed information on each argument.
+
+The content and output folders are generated through appending the version
+without dots to the words `content` and `output` respectively, e.g. 
`content2833`
+and `output2833`. These folders are created next to the tool.
+
+From all `.template` files the Steam build scripts will be generated also in 
the

[Bf-blender-cvs] [1a375d6ecee] master: Steam Release: Script creation of Steam build files

[Nathan Letwory]

Commit: 1a375d6eceed4c17f92fd90699645856e0951530
Author: Nathan Letwory
Date:   Wed Dec 16 11:06:36 2020 +0100
Branches: master
https://developer.blender.org/rB1a375d6eceed4c17f92fd90699645856e0951530

Steam Release: Script creation of Steam build files

Script tool for automation of Steam build files for tasks like {T77348}

For in-depth information see the README.

Related Wiki page: https://wiki.blender.org/wiki/Process/Release_On_Steam

Reviewed By: jbakker

Maniphest Tasks: T77348

Differential Revision: https://developer.blender.org/D8429

===

M   release/datafiles/locale
M   release/scripts/addons
A   release/steam/README.md
A   release/steam/blender_app_build.vdf.template
A   release/steam/create_steam_builds.py
A   release/steam/depot_build_linux.vdf.template
A   release/steam/depot_build_macos.vdf.template
A   release/steam/depot_build_win.vdf.template

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 9e40c01dffd..877a343fed9 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 9e40c01dffd3f720b23b906d20df8e999d34a4af
+Subproject commit 877a343fed9613d8e02e7fe7181d3bbb628506f2
diff --git a/release/scripts/addons b/release/scripts/addons
index 1a3f127714e..f8a16827a25 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1a3f127714e8da9f0af12d9a174dae9793ae63c1
+Subproject commit f8a16827a2568088e5206e9d4432c5b57aae3eb5
diff --git a/release/steam/README.md b/release/steam/README.md
new file mode 100644
index 000..05eda799c3f
--- /dev/null
+++ b/release/steam/README.md
@@ -0,0 +1,70 @@
+Creating Steam builds for Blender
+=
+
+This script automates creation of the Steam files: download of the archives,
+extraction of the archives, preparation of the build scripts (VDF files), 
actual
+building of the Steam game files.
+
+Requirements
+
+
+* MacOS machine - Tested on Catalina 10.15.6. Extracting contents from the DMG
+  archive did not work Windows nor on Linux using 7-zip. All DMG archives 
tested
+  failed to be extracted. As such only MacOS is known to work.
+* Steam SDK downloaded from SteamWorks - The `steamcmd` is used to generate the
+  Steam game files. The path to the `steamcmd` is what is actually needed.
+* SteamWorks credentials - Needed to log in using `steamcmd`.
+* Login to SteamWorks with the `steamcmd` from the command-line at least once -
+  Needded to ensure the user is properly logged in. On a new machine the user
+  will have to go through two-factor authentication.
+* App ID and Depot IDs - Needed to create the VDF files.
+* Python 3.x - 3.7 was tested.
+* Base URL - for downloading the archives.
+
+Usage
+=
+
+```bash
+$ export STEAMUSER=SteamUserName
+$ export STEAMPW=SteamUserPW
+$ export BASEURL=https://download.blender.org/release/Blender2.83/
+$ export VERSION=2.83.3
+$ export APPID=appidnr
+$ export WINID=winidnr
+$ export LINID=linuxidnr
+$ export MACOSID=macosidnr
+
+# log in to SteamWorks from command-line at least once
+
+$ ../sdk/tools/ContentBuilder/builder_osx/steamcmd +login $STEAMUSER $STEAMPW
+
+# once that has been done we can now actually start our tool
+
+$ python3.7 create_steam_builds.py --baseurl $BASEURL --version $VERSION 
--appid $APPID --winid $WINID --linuxid $LINID --macosid $MACOSID --steamuser 
$STEAMUSER --steampw $STEAMPW --steamcmd 
../sdk/tools/ContentBuilder/builder_osx/steamcmd
+```
+
+All arguments in the above example are required.
+
+At the start the tool will login using `steamcmd`. This is necessary to let the
+Steam SDK update itself if necessary.
+
+There are a few optional arguments:
+
+* `--dryrun`: If set building the game files will not actually happen. A set of
+  log files and a preview manifest per depot will be created in the output 
folder.
+  This can be used to double-check everything works as expected.
+* `--skipdl`: If set will skip downloading of the archives. The tool expects 
the
+  archives to already exist in the correct content location.
+* `--skipextract`: If set will skip extraction of all archives. The tool 
expects
+  the archives to already have been correctly extracted in the content 
location.
+
+Run the tool with `-h` for detailed information on each argument.
+
+The content and output folders are generated through appending the version
+without dots to the words `content` and `output` respectively, e.g. 
`content2833`
+and `output2833`. These folders are created next to the tool.
+
+From all `.template` files the Steam build scripts will be generated also in 
the
+same directory as the tool. The files will have the extension `.vdf`.
+
+In case of errors the tool will have a non-zero return code.
\ No newline at end of file
diff --git a/release/steam/blender_app_build.vdf.template

[Bf-blender-cvs] [6c9c4790484] blender-v2.83-release: Windows Release: Script creation of MSIX package

[Nathan Letwory]

Commit: 6c9c47904841d729d27393851133dc2764184960
Author: Nathan Letwory
Date:   Wed Sep 23 11:19:49 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB6c9c47904841d729d27393851133dc2764184960

Windows Release: Script creation of MSIX package

Script create_msix_package.py will download the ZIP file
from the given URL. It will create the MSIX package
with the version number and publisher ID given.

Strongly recommended are the path to a valid PFX file, and the
password to use that PFX file. These are needed for signing
the resulting MSIX package. The signing step is optional though,
but the resulting MSIX package cannot be installed outside of the
Microsoft Store

Example

set VERSION=2.83.2.0
set 
URL=https://download.blender.org/release/Blender2.83/blender-2.83.2-windows64.zip
set PUBID=CN=PUBIDHERE
set PFX=X:\path\to\cert.pfx
set PFXPW=pwhere

python create_msix_package.py --version %VERSION% --url %URL% --publisher 
%PUBID% --pfx %PFX% --password %PFXPW%

Requirements:
* Python default from the Microsoft Store should do (3.8)
* requests can be installed with `pip install requests`

Note that for an LTS release that gets uploaded to its own LTS application 
release
in the store you need to specify the `--lts` switch on the command-line to the 
script.

Upon completion there will be a file with the
name blender-2.83.2.0-windows64.msix. In case PFX file and its password were
given on the command line MSIX package will also be signed for the Microsoft 
Store.

Related Wiki page: 
https://wiki.blender.org/wiki/Process/Release_On_Windows_Store

Reviewed By: jbakker

Maniphest Tasks: T77348, T79356

Differential Revision: https://developer.blender.org/D8310

===

A   release/windows/msix/AppxManifest.xml.template
A   release/windows/msix/Assets/Square150x150Logo.png
A   release/windows/msix/Assets/Square310x310Logo.png
A   release/windows/msix/Assets/Square44x44Logo.png
A   release/windows/msix/Assets/Square71x71Logo.png
A   release/windows/msix/Assets/StoreLogo.png
A   release/windows/msix/Assets/Wide310x150Logo.png
A   release/windows/msix/README.md
A   release/windows/msix/create_msix_package.py

===

diff --git a/release/windows/msix/AppxManifest.xml.template 
b/release/windows/msix/AppxManifest.xml.template
new file mode 100644
index 000..9289a67efef
--- /dev/null
+++ b/release/windows/msix/AppxManifest.xml.template
@@ -0,0 +1,60 @@
+
+http://schemas.microsoft.com/appx/manifest/foundation/windows10"; 
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"; 
xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"; 
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"; 
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"; 
xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"; 
xmlns:uap7="http://schemas.microsoft.com/appx/manifest [...]
+  
+  
+Blender[LTSORNOT]
+Blender Foundation
+Blender [VERSION] is the Free and Open Source 3D creation 
suite
+Assets\StoreLogo.png
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+   
+   
+   
+  
+
+  
+  
+
+  
+
+  .blend
+
+
+  open
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
diff --git a/release/windows/msix/Assets/Square150x150Logo.png 
b/release/windows/msix/Assets/Square150x150Logo.png
new file mode 100644
index 000..7dbbde793ba
Binary files /dev/null and b/release/windows/msix/Assets/Square150x150Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square310x310Logo.png 
b/release/windows/msix/Assets/Square310x310Logo.png
new file mode 100644
index 000..2190415e35b
Binary files /dev/null and b/release/windows/msix/Assets/Square310x310Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square44x44Logo.png 
b/release/windows/msix/Assets/Square44x44Logo.png
new file mode 100644
index 000..7b9ca070558
Binary files /dev/null and b/release/windows/msix/Assets/Square44x44Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square71x71Logo.png 
b/release/windows/msix/Assets/Square71x71Logo.png
new file mode 100644
index 000..75bd9bb264a
Binary files /dev/null and b/release/windows/msix/Assets/Square71x71Logo.png 
differ
diff --git a/release/windows/msix/Assets/StoreLogo.png 
b/release/windows/msix/Assets/StoreLogo.png
new file mode 100644
index 000..e8a671b7e0f
Binary files /dev/null and b/release/windows/msix/Assets/StoreLogo.png differ
diff --git a/release/windows/msix/Assets/Wide310x150Logo.png 
b/release/window

[Bf-blender-cvs] [782baa8f54b] master: Windows Release: Script creation of MSIX package

[Nathan Letwory]

Commit: 782baa8f54bca659fdae60391147adbcad93d2bb
Author: Nathan Letwory
Date:   Wed Sep 23 11:19:49 2020 +0200
Branches: master
https://developer.blender.org/rB782baa8f54bca659fdae60391147adbcad93d2bb

Windows Release: Script creation of MSIX package

Script create_msix_package.py will download the ZIP file
from the given URL. It will create the MSIX package
with the version number and publisher ID given.

Strongly recommended are the path to a valid PFX file, and the
password to use that PFX file. These are needed for signing
the resulting MSIX package. The signing step is optional though,
but the resulting MSIX package cannot be installed outside of the
Microsoft Store

Example

set VERSION=2.83.2.0
set 
URL=https://download.blender.org/release/Blender2.83/blender-2.83.2-windows64.zip
set PUBID=CN=PUBIDHERE
set PFX=X:\path\to\cert.pfx
set PFXPW=pwhere

python create_msix_package.py --version %VERSION% --url %URL% --publisher 
%PUBID% --pfx %PFX% --password %PFXPW%

Requirements:
* Python default from the Microsoft Store should do (3.8)
* requests can be installed with `pip install requests`

Note that for an LTS release that gets uploaded to its own LTS application 
release
in the store you need to specify the `--lts` switch on the command-line to the 
script.

Upon completion there will be a file with the
name blender-2.83.2.0-windows64.msix. In case PFX file and its password were
given on the command line MSIX package will also be signed for the Microsoft 
Store.

Related Wiki page: 
https://wiki.blender.org/wiki/Process/Release_On_Windows_Store

Reviewed By: jbakker

Maniphest Tasks: T77348, T79356

Differential Revision: https://developer.blender.org/D8310

===

M   release/scripts/addons
A   release/windows/msix/AppxManifest.xml.template
A   release/windows/msix/Assets/Square150x150Logo.png
A   release/windows/msix/Assets/Square310x310Logo.png
A   release/windows/msix/Assets/Square44x44Logo.png
A   release/windows/msix/Assets/Square71x71Logo.png
A   release/windows/msix/Assets/StoreLogo.png
A   release/windows/msix/Assets/Wide310x150Logo.png
A   release/windows/msix/README.md
A   release/windows/msix/create_msix_package.py

===

diff --git a/release/scripts/addons b/release/scripts/addons
index 1be0b3210d8..feca8c52897 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1be0b3210d8a3a30e99a853b50703a7ca7e8ac1e
+Subproject commit feca8c5289794a70bdd375be76fc4bc59d83c96b
diff --git a/release/windows/msix/AppxManifest.xml.template 
b/release/windows/msix/AppxManifest.xml.template
new file mode 100644
index 000..9289a67efef
--- /dev/null
+++ b/release/windows/msix/AppxManifest.xml.template
@@ -0,0 +1,60 @@
+
+http://schemas.microsoft.com/appx/manifest/foundation/windows10"; 
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"; 
xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"; 
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"; 
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"; 
xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"; 
xmlns:uap7="http://schemas.microsoft.com/appx/manifest [...]
+  
+  
+Blender[LTSORNOT]
+Blender Foundation
+Blender [VERSION] is the Free and Open Source 3D creation 
suite
+Assets\StoreLogo.png
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+   
+   
+   
+  
+
+  
+  
+
+  
+
+  .blend
+
+
+  open
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
diff --git a/release/windows/msix/Assets/Square150x150Logo.png 
b/release/windows/msix/Assets/Square150x150Logo.png
new file mode 100644
index 000..7dbbde793ba
Binary files /dev/null and b/release/windows/msix/Assets/Square150x150Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square310x310Logo.png 
b/release/windows/msix/Assets/Square310x310Logo.png
new file mode 100644
index 000..2190415e35b
Binary files /dev/null and b/release/windows/msix/Assets/Square310x310Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square44x44Logo.png 
b/release/windows/msix/Assets/Square44x44Logo.png
new file mode 100644
index 000..7b9ca070558
Binary files /dev/null and b/release/windows/msix/Assets/Square44x44Logo.png 
differ
diff --git a/release/windows/msix/Assets/Square71x71Logo.png 
b/release/windows/msix/Assets/Square71x71Logo.png
new file mode 100644
index 000..75bd9bb264a
Binary files /dev/null and b/release/windows/msix/Assets/Square71x71Logo.png 
differ
diff 

[Bf-blender-cvs] [5a1a4f4dd24] master: master is now 2.91.0 alpha.

[Nathan Letwory]

Commit: 5a1a4f4dd24de20c369780a0fa0d2f5e73bbeae4
Author: Nathan Letwory
Date:   Wed Jul 22 16:48:29 2020 +0300
Branches: master
https://developer.blender.org/rB5a1a4f4dd24de20c369780a0fa0d2f5e73bbeae4

master is now 2.91.0 alpha.

===

M   doc/doxygen/Doxyfile
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 1e430823b10..6e4a087fa36 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "V2.90"
+PROJECT_NUMBER = "V2.91"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 77d2a973c50..800a3a426b7 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -32,15 +32,15 @@ extern "C" {
  */
 
 /* Blender major and minor version. */
-#define BLENDER_VERSION 290
+#define BLENDER_VERSION 291
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 7
+#define BLENDER_FILE_SUBVERSION 0
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the 
file

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [62a0e1d54fa] master: Merge branch 'blender-v2.90-release'

[Nathan Letwory]

Commit: 62a0e1d54fa122f5383327d9f9afefa65b7f7760
Author: Nathan Letwory
Date:   Wed Jul 22 16:47:26 2020 +0300
Branches: master
https://developer.blender.org/rB62a0e1d54fa122f5383327d9f9afefa65b7f7760

Merge branch 'blender-v2.90-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0c0a9dabc78] blender-v2.90-release: Ensure submodules are at their correct commits.

[Nathan Letwory]

Commit: 0c0a9dabc7871a4f003828e073e311bbc82a0b48
Author: Nathan Letwory
Date:   Wed Jul 22 16:15:53 2020 +0300
Branches: blender-v2.90-release
https://developer.blender.org/rB0c0a9dabc7871a4f003828e073e311bbc82a0b48

Ensure submodules are at their correct commits.

===

M   release/datafiles/locale
M   release/scripts/addons
M   release/scripts/addons_contrib
M   source/tools

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index f1ab6e28bf1..4af22e0492f 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f1ab6e28bf1626daf898fc65e144f1e4e4f2098a
+Subproject commit 4af22e0492f401c609a0203cad1a9bc7fa00b863
diff --git a/release/scripts/addons b/release/scripts/addons
index 9128155de32..25b00a0a52c 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 9128155de32592d84b08426a54ae1e56f02d4635
+Subproject commit 25b00a0a52c81408b9dc15ea320a79ee956b3c0a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 45aa940dabd..f2f4a8b3bfa 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 45aa940dabda64f7877c6d5dd843998a86f0a836
+Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a
diff --git a/source/tools b/source/tools
index 5cf2fc3e5dc..6a252de776d 16
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310
+Subproject commit 6a252de776d0b9dca3167c30a7621a4f1e9bc911

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a4e3943a08e] blender-v2.90-release: Release branch is now in beta.

[Nathan Letwory]

Commit: a4e3943a08ef739c4c1ce3f8f61f8040f246a1f5
Author: Nathan Letwory
Date:   Wed Jul 22 16:41:29 2020 +0300
Branches: blender-v2.90-release
https://developer.blender.org/rBa4e3943a08ef739c4c1ce3f8f61f8040f246a1f5

Release branch is now in beta.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 556c1c961dc..77d2a973c50 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@ extern "C" {
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [211b6c29f77] blender-v2.83-release: Remove trailing space

[Nathan Letwory]

Commit: 211b6c29f771809a39a2b8155e8bb64489c7522c
Author: Nathan Letwory
Date:   Wed Jun 3 17:38:22 2020 +0300
Branches: blender-v2.83-release
https://developer.blender.org/rB211b6c29f771809a39a2b8155e8bb64489c7522c

Remove trailing space

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 3959b009e98..71804f24ac3 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -32,7 +32,7 @@
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE release 
+#define BLENDER_VERSION_CYCLE release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [dc8475ec6ad] blender-v2.83-release: Splash: new image for 2.83 by Ian Hubert

[Nathan Letwory]

Commit: dc8475ec6ad05a62f0df40a4bf1418daae0d6053
Author: Nathan Letwory
Date:   Wed Jun 3 15:19:34 2020 +0300
Branches: blender-v2.83-release
https://developer.blender.org/rBdc8475ec6ad05a62f0df40a4bf1418daae0d6053

Splash: new image for 2.83 by Ian Hubert

===

M   release/datafiles/splash.png

===

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index 7f94a491469..b5c510fe3e7 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [82e3bd4bbb8] blender-v2.83-release: Ensure submodules are at correct commits for 2.83

[Nathan Letwory]

Commit: 82e3bd4bbb82b31d8c7c03454d161fca8e4da45a
Author: Nathan Letwory
Date:   Wed Jun 3 15:23:39 2020 +0300
Branches: blender-v2.83-release
https://developer.blender.org/rB82e3bd4bbb82b31d8c7c03454d161fca8e4da45a

Ensure submodules are at correct commits for 2.83

===

M   release/datafiles/locale
M   release/scripts/addons

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 0fd21a7cc38..e8bc1883fd4 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 0fd21a7cc382066d184fda8153f925bb825af2c6
+Subproject commit e8bc1883fd4de04ceb275a12736501bb37d1406a
diff --git a/release/scripts/addons b/release/scripts/addons
index 9a9832d5d7f..7fd30539c69 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 9a9832d5d7fe61a446516f2e2722f8356bd7e709
+Subproject commit 7fd30539c69ce4aa3363e0d7c5e00ff4ca13886b

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [3c9f80c898a] blender-v2.83-release: Move 2.83 from beta to release

[Nathan Letwory]

Commit: 3c9f80c898a693b57f511c7af592fb93ffbd6652
Author: Nathan Letwory
Date:   Wed Jun 3 15:21:51 2020 +0300
Branches: blender-v2.83-release
https://developer.blender.org/rB3c9f80c898a693b57f511c7af592fb93ffbd6652

Move 2.83 from beta to release

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index f1b274a2002..3959b009e98 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -32,7 +32,7 @@
 /* Blender patch version for bugfix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE release 
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b9ec9afce18] master: Bump master to 2.90 alpha for bcon1

[Nathan Letwory]

Commit: b9ec9afce18900feebabbc2cdc52b7ba13f4878d
Author: Nathan Letwory
Date:   Wed Apr 15 15:06:00 2020 +0300
Branches: master
https://developer.blender.org/rBb9ec9afce18900feebabbc2cdc52b7ba13f4878d

Bump master to 2.90 alpha for bcon1

===

M   doc/doxygen/Doxyfile
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index ecd60957f2b..dea06a8cfdb 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "V2.83"
+PROJECT_NUMBER = "V2.90"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index b9eab004ddf..bc64f78ffae 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -26,8 +26,8 @@
  *
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
-#define BLENDER_VERSION 283
-#define BLENDER_SUBVERSION 13
+#define BLENDER_VERSION 290
+#define BLENDER_SUBVERSION 0
 /** Several breakages with 280, e.g. collections vs layers. */
 #define BLENDER_MINVERSION 280
 #define BLENDER_MINSUBVERSION 0

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [5fb4ff77118] master: Ensure 2.90 is still alpha for bcon1

[Nathan Letwory]

Commit: 5fb4ff77118d03e55f756b5cab1331bc315ec8e7
Author: Nathan Letwory
Date:   Wed Apr 15 16:02:24 2020 +0300
Branches: master
https://developer.blender.org/rB5fb4ff77118d03e55f756b5cab1331bc315ec8e7

Ensure 2.90 is still alpha for bcon1

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index a6fbf36bc17..bc64f78ffae 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [69a2af7e845] master: Merge branch 'blender-v2.83-release'

[Nathan Letwory]

Commit: 69a2af7e8456629d1defd38858f8d20715cb1725
Author: Nathan Letwory
Date:   Wed Apr 15 16:01:49 2020 +0300
Branches: master
https://developer.blender.org/rB69a2af7e8456629d1defd38858f8d20715cb1725

Merge branch 'blender-v2.83-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [54736d50586] blender-v2.83-release: Bump release cycle to beta for 2.83

[Nathan Letwory]

Commit: 54736d505866140e41f70d812cf917353240b0a0
Author: Nathan Letwory
Date:   Wed Apr 15 15:03:05 2020 +0300
Branches: blender-v2.83-release
https://developer.blender.org/rB54736d505866140e41f70d812cf917353240b0a0

Bump release cycle to beta for 2.83

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index b9eab004ddf..c9a4d81604b 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [9ca1b721b49] master: Ensure master points at latest submodule heads

[Nathan Letwory]

Commit: 9ca1b721b497f6e03513ab70c9283bd1f06b2d13
Author: Nathan Letwory
Date:   Wed Apr 15 14:41:47 2020 +0300
Branches: master
https://developer.blender.org/rB9ca1b721b497f6e03513ab70c9283bd1f06b2d13

Ensure master points at latest submodule heads

===

M   release/datafiles/locale
M   release/scripts/addons
M   release/scripts/addons_contrib
M   source/tools

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index ad82c4ce43e..c68481a509e 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
+Subproject commit c68481a509eaf79ce61a4391ec1e11a7760d5457
diff --git a/release/scripts/addons b/release/scripts/addons
index 47a32a5370d..cc1a2f5af86 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 47a32a5370d36942674621e5a03e57e8dd4986d8
+Subproject commit cc1a2f5af8681158905be040099ea14bb814b331
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 7077ff07384..9468c406fb5 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 7077ff07384491d1f7630484995557f1c7302dae
+Subproject commit 9468c406fb554e32ff47b62bfef356b3908ec651
diff --git a/source/tools b/source/tools
index 2afbb8ec472..35dd27ded66 16
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit 35dd27ded664b1068e773c27988ee221f3ce39d9

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [375c7dc4caf] blender-v2.82-release: Move 2.82a from beta to release

[Nathan Letwory]

Commit: 375c7dc4caf449d40f11d3fd40fa1372636e76d3
Author: Nathan Letwory
Date:   Thu Mar 12 07:06:44 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rB375c7dc4caf449d40f11d3fd40fa1372636e76d3

Move 2.82a from beta to release

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 7914909c250..eb63bdbdbf2 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR a
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE release
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [9d69a0e518c] blender-v2.82-release: Revert typo fix to ensure localisations don't break

[Nathan Letwory]

Commit: 9d69a0e518cbab4673be2a35a3aef286bd2d82ab
Author: Nathan Letwory
Date:   Mon Mar 9 21:59:12 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rB9d69a0e518cbab4673be2a35a3aef286bd2d82ab

Revert typo fix to ensure localisations don't break

===

M   source/blender/makesrna/intern/rna_fluid.c

===

diff --git a/source/blender/makesrna/intern/rna_fluid.c 
b/source/blender/makesrna/intern/rna_fluid.c
index eab000760ae..c1c5d768b23 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -1263,7 +1263,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA 
*brna)
   RNA_def_property_ui_text(
   prop,
   "Threshold",
-  "Maximum amount of fluid a cell can contain before it is considered 
empty");
+  "Maximum amount of fluid cell can contain before it is considered 
empty");
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, 
"rna_Fluid_resetCache");
 
   prop = RNA_def_property(srna, "use_adaptive_domain", PROP_BOOLEAN, 
PROP_NONE);

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [b0630305345] blender-v2.82-release: Update add-ons submodule with fixes for 2.82a

[Nathan Letwory]

Commit: b06303053450802caa1a95646c3a9e7b852b39a3
Author: Nathan Letwory
Date:   Mon Mar 9 21:55:35 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rBb06303053450802caa1a95646c3a9e7b852b39a3

Update add-ons submodule with fixes for 2.82a

===

M   release/scripts/addons

===

diff --git a/release/scripts/addons b/release/scripts/addons
index 6b61dff0841..08eaeef293a 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 6b61dff0841600368710710894ccc0c20867929f
+Subproject commit 08eaeef293a993551e87b04258c223e176e4de5f

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a7c338c3800] blender-v2.82-release: Fix crash when compiling renderpass shader on some AMD drivers

[Nathan Letwory]

Commit: a7c338c38005a6b08b304b7dcf6574bef71f3762
Author: Nathan Letwory
Date:   Mon Mar 9 20:25:35 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rBa7c338c38005a6b08b304b7dcf6574bef71f3762

Fix crash when compiling renderpass shader on some AMD drivers

Differential Revision: https://developer.blender.org/D6959

# Conflicts:
#   
source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl

===

M   
source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl

===

diff --git 
a/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl 
b/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl
index 35bfb411cb9..3475fee901a 100644
--- a/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl
@@ -15,6 +15,7 @@ out vec4 fragColor;
 
 void main()
 {
+  vec3 color;
   ivec2 texel = ivec2(gl_FragCoord.xy);
 
   if (renderpassType == SCE_PASS_Z) {
@@ -25,7 +26,7 @@ void main()
 else {
   depth = -get_view_z_from_depth(depth);
 }
-fragColor.r = depth;
+color = vec3(depth);
   }
 
   else if (renderpassType == SCE_PASS_AO) {
@@ -41,24 +42,26 @@ void main()
 if (depth != 1.0 && any(notEqual(encoded_normal, vec2(0.0 {
   vec3 decoded_normal = normal_decode(texelFetch(inputBuffer, texel, 
0).rg, vec3(0.0));
   vec3 world_normal = mat3(ViewMatrixInverse) * decoded_normal;
-  fragColor = vec4(world_normal, 1.0);
+  color = world_normal;
 }
 else {
-  fragColor = vec4(0.0, 0.0, 0.0, 1.0);
+  color = vec3(0.0);
 }
   }
 
   else if ((renderpassType & ACCUMULATED_VALUE_PASSES) != 0) {
 float accumulated_value = texelFetch(inputBuffer, texel, 0).r;
-fragColor = vec4(vec3(accumulated_value / currentSample), 1.0);
+color = vec3(accumulated_value / currentSample);
   }
 
   else if ((renderpassType & ACCUMULATED_COLOR_PASSES) != 0) {
 vec3 accumulated_color = texelFetch(inputBuffer, texel, 0).rgb;
-fragColor = vec4(accumulated_color / currentSample, 1.0);
+color = (accumulated_color / currentSample);
   }
 
   else {
-fragColor = vec4(1.0, 0.0, 1.0, 1.0);
+color = vec4(1.0, 0.0, 1.0, 1.0);
   }
+
+  fragColor = vec4(color, 1.0);
 }

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [14000c42fc7] blender-v2.82-release: Bump version to 2.82a beta.

[Nathan Letwory]

Commit: 14000c42fc7cacfe48ab200be8127f21faf063d3
Author: Nathan Letwory
Date:   Mon Mar 9 21:32:16 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rB14000c42fc7cacfe48ab200be8127f21faf063d3

Bump version to 2.82a beta.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index b43c2b2b68a..7914909c250 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -34,9 +34,9 @@
 
 /** Used by packaging tools. */
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR a
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE beta
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [49b66ad9147] master: Merge branch 'blender-v2.82-release' into master

[Nathan Letwory]

Commit: 49b66ad9147a41523eab6b4e579d282d66b9a70a
Author: Nathan Letwory
Date:   Thu Feb 6 18:57:36 2020 +0200
Branches: master
https://developer.blender.org/rB49b66ad9147a41523eab6b4e579d282d66b9a70a

Merge branch 'blender-v2.82-release' into master

===



===

diff --cc release/scripts/addons
index ad6928706de,8b659917bae..cbcf507f304
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit ad6928706de2fa8f44fa35a275453c716d65e773
 -Subproject commit 8b659917baecbea5471a05369aa754ae544a814b
++Subproject commit cbcf507f3045e867c4b2d8e0976b76e1753dc49b

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [f8756554180] blender-v2.82-release: Reference correct sha1s of submodules

[Nathan Letwory]

Commit: f8756554180e583ea765eca4e3931d1bda84ebd9
Author: Nathan Letwory
Date:   Thu Feb 6 18:24:57 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rBf8756554180e583ea765eca4e3931d1bda84ebd9

Reference correct sha1s of submodules

===

M   release/datafiles/locale
M   release/scripts/addons
M   release/scripts/addons_contrib

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 8a05b618f03..34d98762cef 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 8a05b618f031582c006c6f62b9e60619ab3eef8b
+Subproject commit 34d98762cef85b9c065f21a051d1dbe3bf2979b7
diff --git a/release/scripts/addons b/release/scripts/addons
index 1470f353c65..8b659917bae 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1470f353c65034db91131d21ab9c782d029a2ee9
+Subproject commit 8b659917baecbea5471a05369aa754ae544a814b
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index ffbaca558a2..70b649775ee 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit ffbaca558a27bab4716bcd51ca7ea1df8e4f4b14
+Subproject commit 70b649775bedb02c1c7b7aa996a7f6294177

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [c91ebcd7ab5] master: Docs: roll version to 2.83 for master

[Nathan Letwory]

Commit: c91ebcd7ab5ea1b284fcce96c9d62aa497356af8
Author: Nathan Letwory
Date:   Fri Jan 10 15:21:08 2020 +0200
Branches: master
https://developer.blender.org/rBc91ebcd7ab5ea1b284fcce96c9d62aa497356af8

Docs: roll version to 2.83 for master

===

M   doc/doxygen/Doxyfile

===

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index c07a80bf0d5..ecd60957f2b 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "V2.82"
+PROJECT_NUMBER = "V2.83"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [a72d823489f] master: Version cycle to 2.83 alpha for master.

[Nathan Letwory]

Commit: a72d823489fe827e913ed115b4f865ce67857480
Author: Nathan Letwory
Date:   Fri Jan 10 11:25:54 2020 +0200
Branches: master
https://developer.blender.org/rBa72d823489fe827e913ed115b4f865ce67857480

Version cycle to 2.83 alpha for master.

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 9855c2202cc..dd3e381ef5d 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -26,8 +26,8 @@
  *
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
-#define BLENDER_VERSION 282
-#define BLENDER_SUBVERSION 6
+#define BLENDER_VERSION 283
+#define BLENDER_SUBVERSION 0
 /** Several breakages with 280, e.g. collections vs layers. */
 #define BLENDER_MINVERSION 280
 #define BLENDER_MINSUBVERSION 0

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [20ca8fddf8b] master: Merge branch 'blender-v2.82-release'

[Nathan Letwory]

Commit: 20ca8fddf8bf75affcfa3fd829ff2c794b853290
Author: Nathan Letwory
Date:   Fri Jan 10 11:26:03 2020 +0200
Branches: master
https://developer.blender.org/rB20ca8fddf8bf75affcfa3fd829ff2c794b853290

Merge branch 'blender-v2.82-release'

===



===



___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [c3d6929e4f2] master: Version cycle 2.83, master is now in alpha and open for new work and features

[Nathan Letwory]

Commit: c3d6929e4f21ae2e219cd7711bd60e511c302d3e
Author: Nathan Letwory
Date:   Fri Jan 10 11:26:52 2020 +0200
Branches: master
https://developer.blender.org/rBc3d6929e4f21ae2e219cd7711bd60e511c302d3e

Version cycle 2.83, master is now in alpha and open for new work and features

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 73009058c4e..dd3e381ef5d 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [95200045f31] blender-v2.82-release: Version 2.82 cycle to beta for bcon3, stabilizing period

[Nathan Letwory]

Commit: 95200045f312dd90851f8dfa4c7601bec762a823
Author: Nathan Letwory
Date:   Thu Jan 9 22:05:27 2020 +0200
Branches: blender-v2.82-release
https://developer.blender.org/rB95200045f312dd90851f8dfa4c7601bec762a823

Version 2.82 cycle to beta for bcon3, stabilizing period

===

M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index 9855c2202cc..75e14b7efca 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
 /** Optionally set to 1,2,... for example to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [9d95c035c59] master: Docs: 2.82 release description for Linux appdata

[Nathan Letwory]

Commit: 9d95c035c599c4229eb2cf2ad936c9ddaee8e9df
Author: Nathan Letwory
Date:   Thu Jan 9 21:46:58 2020 +0200
Branches: master
https://developer.blender.org/rB9d95c035c599c4229eb2cf2ad936c9ddaee8e9df

Docs: 2.82 release description for Linux appdata

===

M   release/freedesktop/org.blender.Blender.appdata.xml

===

diff --git a/release/freedesktop/org.blender.Blender.appdata.xml 
b/release/freedesktop/org.blender.Blender.appdata.xml
index 984b5b3b15e..afbf06c5a72 100644
--- a/release/freedesktop/org.blender.Blender.appdata.xml
+++ b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,25 @@
 
 
 
+
+
+New features:
+
+Grease pencil stroke
+Custom bevel profiles and cutoff vertex mesh 
method
+Custom render passes possible for Cycles
+UDIM support
+Basic USD export
+Mantaflow integration
+
+Enhancements:
+Improvements to rigging and animation tools
+Many grease pencil improvements
+Many sculpting tool improvements
+
+
+
 
 
 New features:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [26bd5ebd42e] blender-v2.81-release: Update rest of submodules to correct commit for Blender 2.81 release

[Nathan Letwory]

Commit: 26bd5ebd42e36c7d0cc1f156447080b1f6099897
Author: Nathan Letwory
Date:   Wed Nov 20 16:27:37 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rB26bd5ebd42e36c7d0cc1f156447080b1f6099897

Update rest of submodules to correct commit for Blender 2.81 release

===

M   release/scripts/addons
M   release/scripts/addons_contrib
M   source/tools

===

diff --git a/release/scripts/addons b/release/scripts/addons
index 120d31a17c0..64dcfc8dc1c 16
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 120d31a17c0eb571420b828425fc1fe6ef13db2d
+Subproject commit 64dcfc8dc1c43a77f16c848219cac5e396368093
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index d9ed9d4d064..8fcd2e98dae 16
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit d9ed9d4d064c74c86e2767cd4be32d602a0ee317
+Subproject commit 8fcd2e98daee4ac97f86d40a3e6cf730c38ac49d
diff --git a/source/tools b/source/tools
index 4ad446dbddd..d8c4ae2c23a 16
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 4ad446dbddd1b23acc185b8c056474d27b69278b
+Subproject commit d8c4ae2c23a36d9609d47142dc72f243551258f1

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [e8b0a13c317] blender-v2.81-release: Update to correct locale submodule for 2.81 release

[Nathan Letwory]

Commit: e8b0a13c3178ab143789402de130cbadac4f8a04
Author: Nathan Letwory
Date:   Wed Nov 20 16:22:26 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rBe8b0a13c3178ab143789402de130cbadac4f8a04

Update to correct locale submodule for 2.81 release

===

M   release/datafiles/locale

===

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 88497d7507e..5402eec9637 16
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 88497d7507e76281fbdd0cc1f8451f81ae7e3785
+Subproject commit 5402eec9637b5c360e35bdd936d9e7a076d5df7f

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [ab1b02e3898] blender-v2.81-release: Blender 2.81: New splash and release cycle bump

[Nathan Letwory]

Commit: ab1b02e3898dfbfa6534104ea8793c5b4b492e95
Author: Nathan Letwory
Date:   Wed Nov 20 15:06:14 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rBab1b02e3898dfbfa6534104ea8793c5b4b492e95

Blender 2.81: New splash and release cycle bump

Splash by Alex Trevino / aendom.com
Original concept by Anaïs Maamar

Change release cycle to release.

===

M   release/datafiles/splash.png
M   release/datafiles/splash_2x.png
M   source/blender/blenkernel/BKE_blender_version.h

===

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index 0cf53b840f0..68980cb9993 100644
Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png 
differ
diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png
index d3f6cf6845d..61bb5b69a9e 100644
Binary files a/release/datafiles/splash_2x.png and 
b/release/datafiles/splash_2x.png differ
diff --git a/source/blender/blenkernel/BKE_blender_version.h 
b/source/blender/blenkernel/BKE_blender_version.h
index b6040931923..60c2284285c 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -36,7 +36,7 @@
 /** Can be left blank, otherwise a,b,c... etc with no quotes. */
 #define BLENDER_VERSION_CHAR
 /** alpha/beta/rc/release, docs use this. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE release
 /** Optionally set to 1,2,... for example to to get alpha1 or rc2. */
 #define BLENDER_VERSION_CYCLE_NUMBER

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [f9fcda533bc] master: Fix typo in struct name obejct to object.

[Nathan Letwory]

Commit: f9fcda533bc003e7ad0b262be4eaf5767c16073f
Author: Nathan Letwory
Date:   Mon Feb 5 11:01:00 2018 +0200
Branches: master
https://developer.blender.org/rBf9fcda533bc003e7ad0b262be4eaf5767c16073f

Fix typo in struct name obejct to object.

Reviewers: sergey

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D3041

===

M   intern/cycles/render/object.cpp
M   intern/cycles/render/object.h

===

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 4c06654d756..e03160954bc 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -285,7 +285,7 @@ ObjectManager::~ObjectManager()
 {
 }
 
-void ObjectManager::device_update_object_transform(UpdateObejctTransformState 
*state,
+void ObjectManager::device_update_object_transform(UpdateObjectTransformState 
*state,
Object *ob,
int object_index)
 {
@@ -433,7 +433,7 @@ void 
ObjectManager::device_update_object_transform(UpdateObejctTransformState *s
 }
 
 bool ObjectManager::device_update_object_transform_pop_work(
-UpdateObejctTransformState *state,
+UpdateObjectTransformState *state,
 int *start_index,
 int *num_objects)
 {
@@ -458,7 +458,7 @@ bool ObjectManager::device_update_object_transform_pop_work(
 }
 
 void ObjectManager::device_update_object_transform_task(
-UpdateObejctTransformState *state)
+UpdateObjectTransformState *state)
 {
int start_index, num_objects;
while(device_update_object_transform_pop_work(state,
@@ -478,7 +478,7 @@ void ObjectManager::device_update_transforms(DeviceScene 
*dscene,
  uint *object_flag,
  Progress& progress)
 {
-   UpdateObejctTransformState state;
+   UpdateObjectTransformState state;
state.need_motion = scene->need_motion();
state.have_motion = false;
state.have_curves = false;
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index 88645bc4a80..acdb1b64123 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -113,7 +113,7 @@ public:
 
 protected:
/* Global state of object transform update. */
-   struct UpdateObejctTransformState {
+   struct UpdateObjectTransformState {
/* Global state used by device_update_object_transform().
 * Common for both threaded and non-threaded update.
 */
@@ -152,12 +152,12 @@ protected:
/* First unused object index in the queue. */
int queue_start_object;
};
-   void device_update_object_transform(UpdateObejctTransformState *state,
+   void device_update_object_transform(UpdateObjectTransformState *state,
Object *ob,
const int object_index);
-   void device_update_object_transform_task(UpdateObejctTransformState 
*state);
+   void device_update_object_transform_task(UpdateObjectTransformState 
*state);
bool device_update_object_transform_pop_work(
-   UpdateObejctTransformState *state,
+   UpdateObjectTransformState *state,
int *start_index,
int *num_objects);
 };

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [03b8531] master: Compile fix for Windows.

[Nathan Letwory]

Commit: 03b8531cea965818f04520cdd1c488594dd195cb
Author: Nathan Letwory
Date:   Fri Oct 28 11:54:01 2016 +0300
Branches: master
https://developer.blender.org/rB03b8531cea965818f04520cdd1c488594dd195cb

Compile fix for Windows.

__inline instead of inline is needed.

===

M   extern/rangetree/intern/range_tree.c

===

diff --git a/extern/rangetree/intern/range_tree.c 
b/extern/rangetree/intern/range_tree.c
index 766dd22..4c81036 100644
--- a/extern/rangetree/intern/range_tree.c
+++ b/extern/rangetree/intern/range_tree.c
@@ -521,6 +521,10 @@ static bool rb_is_balanced_root(const Node *root)
 /* - */
 /* Internal RangeTreeUInt API */
 
+#ifdef _WIN32
+#define inline __inline
+#endif
+
 static inline Node *rt_node_alloc(RangeTreeUInt *rt)
 {
 #ifdef USE_TPOOL

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d04e488] master: Add texture coordinate export.

[Nathan Letwory]

Commit: d04e4882730ddea67af1a92d492da1f969c9e243
Author: Nathan Letwory
Date:   Fri Sep 19 10:41:33 2014 +0300
Branches: master
https://developer.blender.org/rBd04e4882730ddea67af1a92d492da1f969c9e243

Add texture coordinate export.

===

M   intern/cycles/app/io_export_cycles_xml.py

===

diff --git a/intern/cycles/app/io_export_cycles_xml.py 
b/intern/cycles/app/io_export_cycles_xml.py
index e310d92..ad8fb9d 100644
--- a/intern/cycles/app/io_export_cycles_xml.py
+++ b/intern/cycles/app/io_export_cycles_xml.py
@@ -111,19 +111,29 @@ class ExportCyclesXML(bpy.types.Operator, ExportHelper):
 # generate mesh node
 nverts = ""
 verts = ""
+uvs = ""
 P = ""
 
 for v in mesh.vertices:
 P += "%f %f %f  " % (v.co[0], v.co[1], v.co[2])
 
-for i, f in enumerate(mesh.tessfaces):
-nverts += str(len(f.vertices)) + " "
+verts_and_uvs = zip(mesh.tessfaces, 
mesh.tessface_uv_textures.active.data)
+
+for f, uvf in verts_and_uvs:
+vcount = len(f.vertices)
+nverts += str(vcount) + " "
 
 for v in f.vertices:
 verts += str(v) + " "
-verts += " "
-
-node = etree.Element('mesh', attrib={'nverts': nverts, 'verts': verts, 
'P': P})
+
+uvs += str(uvf.uv1[0]) + " " + str(uvf.uv1[1]) + " "
+uvs += str(uvf.uv2[0]) + " " + str(uvf.uv2[1]) + " "
+uvs += str(uvf.uv3[0]) + " " + str(uvf.uv3[1]) + " "
+if vcount==4:
+uvs += " " + str(uvf.uv4[0]) + " " + str(uvf.uv4[1]) + " "
+
+
+node = etree.Element('mesh', attrib={'nverts': nverts.strip(), 
'verts': verts.strip(), 'P': P, 'UV' : uvs.strip()})
 
 # write to file
 write(node, filepath)
@@ -139,3 +149,4 @@ def unregister():
 if __name__ == "__main__":
 register()
 
+

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [cd14dcb] master: Don't write all uv textures, but only active uv layer.

[Nathan Letwory]

Commit: cd14dcbe914662ae950c9178f52a63912809fb53
Author: Nathan Letwory
Date:   Thu May 22 12:34:11 2014 +0300
https://developer.blender.org/rBcd14dcbe914662ae950c9178f52a63912809fb53

Don't write all uv textures, but only active uv layer.

Fix T39922

===

M   source/blender/collada/EffectExporter.cpp

===

diff --git a/source/blender/collada/EffectExporter.cpp 
b/source/blender/collada/EffectExporter.cpp
index 6741e92..218f2db 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -310,12 +310,12 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
}
}
 
-
+   int active_uv_layer = -1;
std::set uv_textures;
if (ob->type == OB_MESH && ob->totcol && 
this->export_settings->include_uv_textures) {
bool active_uv_only = this->export_settings->active_uv_only;
Mesh *me = (Mesh *) ob->data;
-   int active_uv_layer = 
CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
+   active_uv_layer = CustomData_get_active_layer_index(&me->pdata, 
CD_MTEXPOLY);
 
BKE_mesh_tessface_ensure(me);
for (int i = 0; i < me->pdata.totlayer; i++) {
@@ -381,13 +381,16 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
}
 
std::set::iterator uv_t_iter;
-   for (uv_t_iter = uv_textures.begin(); uv_t_iter != uv_textures.end(); 
uv_t_iter++ ) {
-   Image *ima = *uv_t_iter;
-   std::string key(id_name(ima));
-   key = translate_id(key);
-   int i = im_samp_map[key];
-   COLLADASW::Sampler *sampler = (COLLADASW::Sampler 
*)samp_surf[i][0];
-   ep.setDiffuse(createTexture(ima, active_uv, sampler), false, 
"diffuse");
+   int idx;
+   for (idx = 0, uv_t_iter = uv_textures.begin(); uv_t_iter != 
uv_textures.end(); uv_t_iter++, idx++ ) {
+   if(active_uv_layer>-1 && idx==active_uv_layer) {
+   Image *ima = *uv_t_iter;
+   std::string key(id_name(ima));
+   key = translate_id(key);
+   int i = im_samp_map[key];
+   COLLADASW::Sampler *sampler = (COLLADASW::Sampler 
*)samp_surf[i][0];
+   ep.setDiffuse(createTexture(ima, active_uv, sampler), 
false, "diffuse");
+   }
}
 
// performs the actual writing

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [9a7c4ea] master: Move BVHType and shadingsystem enums to top-level of Cycles namespace.

[Nathan Letwory]

Commit: 9a7c4ead3f57052c911570d1b507e1f5229210c8
Author: Nathan Letwory
Date:   Fri May 16 16:43:28 2014 +0300
https://developer.blender.org/rB9a7c4ead3f57052c911570d1b507e1f5229210c8

Move BVHType and shadingsystem enums to top-level of Cycles namespace.

Easier access of BVHType and deduplication for ShadingSystem.

Reviewers: dingto, brecht

Differential Revision: https://developer.blender.org/D534

===

M   intern/cycles/blender/blender_sync.cpp
M   intern/cycles/render/object.cpp
M   intern/cycles/render/scene.cpp
M   intern/cycles/render/scene.h
M   intern/cycles/render/session.h
M   intern/cycles/render/shader.cpp
M   intern/cycles/util/util_types.h

===

diff --git a/intern/cycles/blender/blender_sync.cpp 
b/intern/cycles/blender/blender_sync.cpp
index 555692d..d0eac16 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -35,6 +35,7 @@
 #include "util_debug.h"
 #include "util_foreach.h"
 #include "util_opengl.h"
+#include "util_types.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -362,19 +363,19 @@ SceneParams BlenderSync::get_scene_params(BL::Scene 
b_scene, bool background)
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
if(shadingsystem == 0)
-   params.shadingsystem = SceneParams::SVM;
+   params.shadingsystem = ShadingSystem::SVM;
else if(shadingsystem == 1)
-   params.shadingsystem = SceneParams::OSL;
+   params.shadingsystem = ShadingSystem::OSL;

if(background)
-   params.bvh_type = SceneParams::BVH_STATIC;
+   params.bvh_type = BVHType::BVH_STATIC;
else
-   params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, 
"debug_bvh_type");
+   params.bvh_type = (BVHType)RNA_enum_get(&cscene, 
"debug_bvh_type");
 
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, 
"debug_use_spatial_splits");
params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, 
"use_cache"): false;
 
-   if(background && params.shadingsystem != SceneParams::OSL)
+   if(background && params.shadingsystem != ShadingSystem::OSL)
params.persistent_data = r.use_persistent_data();
else
params.persistent_data = false;
@@ -511,9 +512,9 @@ SessionParams 
BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
if(shadingsystem == 0)
-   params.shadingsystem = SessionParams::SVM;
+   params.shadingsystem = ShadingSystem::SVM;
else if(shadingsystem == 1)
-   params.shadingsystem = SessionParams::OSL;
+   params.shadingsystem = ShadingSystem::OSL;

/* color managagement */
params.display_buffer_linear = GLEW_ARB_half_float_pixel && 
b_engine.support_display_space_shader(b_scene);
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 027bfd7..7b2ffef 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -25,6 +25,7 @@
 #include "util_foreach.h"
 #include "util_map.h"
 #include "util_progress.h"
+#include "util_types.h"
 #include "util_vector.h"
 
 CCL_NAMESPACE_BEGIN
@@ -388,7 +389,7 @@ void ObjectManager::device_update(Device *device, 
DeviceScene *dscene, Scene *sc
 
/* prepare for static BVH building */
/* todo: do before to support getting object level coords? */
-   if(scene->params.bvh_type == SceneParams::BVH_STATIC) {
+   if(scene->params.bvh_type == BVHType::BVH_STATIC) {
progress.set_status("Updating Objects", "Applying Static 
Transformations");
apply_static_transforms(dscene, scene, object_flag, progress);
}
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 4f5ad43..2cb8db5 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -61,7 +61,7 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& 
device_info_)
if(device_info_.type == DEVICE_CPU)
shader_manager = ShaderManager::create(this, 
params.shadingsystem);
else
-   shader_manager = ShaderManager::create(this, SceneParams::SVM);
+   shader_manager = ShaderManager::create(this, 
ShadingSystem::SVM);
 
/* Extended image limits for CPU and GPUs */
image_manager->set_extended_image_limits(device_info_);
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h

[Bf-blender-cvs] [0f4018a] master: Remove two unnecessary includes.

[Nathan Letwory]

Commit: 0f4018a8e5bd5c0a66176388eef822805d8ae8fb
Author: Nathan Letwory
Date:   Mon May 19 14:44:02 2014 +0300
https://developer.blender.org/rB0f4018a8e5bd5c0a66176388eef822805d8ae8fb

Remove two unnecessary includes.

===

M   intern/cycles/render/object.cpp
M   intern/cycles/render/shader.cpp

===

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 7fffafd..027bfd7 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -25,7 +25,6 @@
 #include "util_foreach.h"
 #include "util_map.h"
 #include "util_progress.h"
-#include "util_types.h"
 #include "util_vector.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 07608a1..d48cd75 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -28,7 +28,6 @@
 #include "tables.h"
 
 #include "util_foreach.h"
-#include "util_types.h"
 
 CCL_NAMESPACE_BEGIN

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [0684ac9] master: Move ShadingSystem enum to shader.h Add SHADINGSYSTEM_ to enum member names, so it is clear where they are from.

[Nathan Letwory]

Commit: 0684ac93013681261e8acc5ac6296c5de785d7d8
Author: Nathan Letwory
Date:   Mon May 19 13:49:36 2014 +0300
https://developer.blender.org/rB0684ac93013681261e8acc5ac6296c5de785d7d8

Move ShadingSystem enum to shader.h
Add SHADINGSYSTEM_ to enum member names, so it is clear where they
are from.

Revert BVHType enum changes, as there's no need for code dedup here.

===

M   intern/cycles/blender/blender_sync.cpp
M   intern/cycles/render/object.cpp
M   intern/cycles/render/scene.cpp
M   intern/cycles/render/scene.h
M   intern/cycles/render/session.h
M   intern/cycles/render/shader.cpp
M   intern/cycles/render/shader.h
M   intern/cycles/util/util_types.h

===

diff --git a/intern/cycles/blender/blender_sync.cpp 
b/intern/cycles/blender/blender_sync.cpp
index d0eac16..bdb3e20 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -35,7 +35,6 @@
 #include "util_debug.h"
 #include "util_foreach.h"
 #include "util_opengl.h"
-#include "util_types.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -363,19 +362,19 @@ SceneParams BlenderSync::get_scene_params(BL::Scene 
b_scene, bool background)
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
if(shadingsystem == 0)
-   params.shadingsystem = ShadingSystem::SVM;
+   params.shadingsystem = SHADINGSYSTEM_SVM;
else if(shadingsystem == 1)
-   params.shadingsystem = ShadingSystem::OSL;
+   params.shadingsystem = SHADINGSYSTEM_OSL;

if(background)
-   params.bvh_type = BVHType::BVH_STATIC;
+   params.bvh_type = SceneParams::BVH_STATIC;
else
-   params.bvh_type = (BVHType)RNA_enum_get(&cscene, 
"debug_bvh_type");
+   params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, 
"debug_bvh_type");
 
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, 
"debug_use_spatial_splits");
params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, 
"use_cache"): false;
 
-   if(background && params.shadingsystem != ShadingSystem::OSL)
+   if(background && params.shadingsystem != SHADINGSYSTEM_OSL)
params.persistent_data = r.use_persistent_data();
else
params.persistent_data = false;
@@ -512,9 +511,9 @@ SessionParams 
BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
if(shadingsystem == 0)
-   params.shadingsystem = ShadingSystem::SVM;
+   params.shadingsystem = SHADINGSYSTEM_SVM;
else if(shadingsystem == 1)
-   params.shadingsystem = ShadingSystem::OSL;
+   params.shadingsystem = SHADINGSYSTEM_OSL;

/* color managagement */
params.display_buffer_linear = GLEW_ARB_half_float_pixel && 
b_engine.support_display_space_shader(b_scene);
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 7b2ffef..7fffafd 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -389,7 +389,7 @@ void ObjectManager::device_update(Device *device, 
DeviceScene *dscene, Scene *sc
 
/* prepare for static BVH building */
/* todo: do before to support getting object level coords? */
-   if(scene->params.bvh_type == BVHType::BVH_STATIC) {
+   if(scene->params.bvh_type == SceneParams::BVH_STATIC) {
progress.set_status("Updating Objects", "Applying Static 
Transformations");
apply_static_transforms(dscene, scene, object_flag, progress);
}
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 2cb8db5..11928246 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -61,7 +61,7 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& 
device_info_)
if(device_info_.type == DEVICE_CPU)
shader_manager = ShaderManager::create(this, 
params.shadingsystem);
else
-   shader_manager = ShaderManager::create(this, 
ShadingSystem::SVM);
+   shader_manager = ShaderManager::create(this, SHADINGSYSTEM_SVM);
 
/* Extended image limits for CPU and GPUs */
image_manager->set_extended_image_limits(device_info_);
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 94fbbc4..d657e48 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -18,6 +18,7 @@
 #define __SCENE_H__
 
 #include "image.h"
+#include "shader.h"

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60367] trunk/lib/windows/opencollada: Update to 463ba8a2ef5a021ce21df614dde29e0ee800e10b ( https://github.com/ KhronosGroup/OpenCOLLADA )

[Nathan Letwory]

Revision: 60367
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60367
Author:   jesterking
Date: 2013-09-25 13:59:17 + (Wed, 25 Sep 2013)
Log Message:
---
Update to 463ba8a2ef5a021ce21df614dde29e0ee800e10b ( 
https://github.com/KhronosGroup/OpenCOLLADA )

Modified Paths:
--

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABU.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUHashFunctions.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUIDList.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPrerequisites.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStableHeaders.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStringUtils.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUUtils.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix3.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathPrerequisites.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathQuaternion.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathUtils.h

trunk/lib/windows/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathVector3.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFW.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatable.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatableFloat.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationCurve.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationList.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnnotate.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArray.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArrayPrimitiveType.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAxisInfo.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWCode.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColor.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColorOrTexture.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWConstants.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWController.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEdge.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEffect.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWException.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFileInfo.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrDoubleArray.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrParam.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulaNewParam.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulas.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWHashFunctions.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWILoader.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWIWriter.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWImageSource.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInclude.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWIndexList.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceBase.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceBindingBase.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceCamera.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceController.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceGeometry.h

trunk/lib/windows/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceKinematic

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60366] trunk/lib/win64/opencollada: Update to 463ba8a2ef5a021ce21df614dde29e0ee800e10b ( https://github.com/ KhronosGroup/OpenCOLLADA )

[Nathan Letwory]

Revision: 60366
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60366
Author:   jesterking
Date: 2013-09-25 13:41:03 + (Wed, 25 Sep 2013)
Log Message:
---
Update to 463ba8a2ef5a021ce21df614dde29e0ee800e10b ( 
https://github.com/KhronosGroup/OpenCOLLADA )

Modified Paths:
--
trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABU.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUHashFunctions.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUIDList.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPrerequisites.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStableHeaders.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStringUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix3.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathPrerequisites.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathQuaternion.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathVector3.h
trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFW.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatable.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatableFloat.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationCurve.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationList.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnnotate.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArray.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArrayPrimitiveType.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAxisInfo.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWCode.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColor.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColorOrTexture.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWConstants.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWController.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEdge.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEffect.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWException.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFileInfo.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrDoubleArray.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrParam.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulaNewParam.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulas.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWHashFunctions.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWILoader.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWIWriter.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWImageSource.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInclude.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWIndexList.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceBase.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceBindingBase.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceCamera.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceController.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceGeometry.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceKinematicsScene.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceLigh

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60242] trunk/blender/source/blender/ collada/MeshImporter.cpp: Ensure positions can be read for sources that have stride

[Nathan Letwory]

Revision: 60242
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60242
Author:   jesterking
Date: 2013-09-19 21:59:22 + (Thu, 19 Sep 2013)
Log Message:
---
Ensure positions can be read for sources that have stride
defined as 2 (2D coordinates).

Modified Paths:
--
trunk/blender/source/blender/collada/MeshImporter.cpp

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===
--- trunk/blender/source/blender/collada/MeshImporter.cpp   2013-09-19 
20:27:26 UTC (rev 60241)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp   2013-09-19 
21:59:22 UTC (rev 60242)
@@ -665,7 +665,11 @@
 
v[0] = (*values)[i++];
v[1] = (*values)[i++];
-   v[2] = (*values)[i];
+   if(stride>=3) {
+   v[2] = (*values)[i];
+   } else {
+   v[2] = 0.0f;
+   }
 
}
break;
@@ -676,13 +680,18 @@
 
v[0] = (float)(*values)[i++];
v[1] = (float)(*values)[i++];
-   v[2] = (float)(*values)[i];
+   if(stride>=3) {
+   v[2] = (float)(*values)[i];
+   } else {
+   v[2] = 0.0f;
+   }
}
break;
default:
break;
}
 }
+
 bool MeshImporter::is_flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& 
nor, int count)
 {
float a[3], b[3];

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60087] trunk/blender/source/tools/CTS: Fix up the Blender application script for COLLADA CTS.

[Nathan Letwory]

Revision: 60087
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60087
Author:   jesterking
Date: 2013-09-12 21:15:17 + (Thu, 12 Sep 2013)
Log Message:
---
Fix up the Blender application script for COLLADA CTS.
Update version number.
Fix typo in README.txt.
Whitespace changes.

Modified Paths:
--
trunk/blender/source/tools/CTS/FBlender.py
trunk/blender/source/tools/CTS/README.txt

Modified: trunk/blender/source/tools/CTS/FBlender.py
===
--- trunk/blender/source/tools/CTS/FBlender.py  2013-09-12 21:04:02 UTC (rev 
60086)
+++ trunk/blender/source/tools/CTS/FBlender.py  2013-09-12 21:15:17 UTC (rev 
60087)
@@ -1,3 +1,4 @@
+#
 # Written by Nathan Letwory: Letwory Interactive | Studio Lumikuu
 # http://www.letworyinteractive.com/b | http://www.lumikuu.com
 # for Blender Foundation
@@ -10,9 +11,9 @@
 
 class FBlender(FApplication):
 """Presents Blender to the testing framework"""
-
+
 __SCRIPT_EXTENSION = ".py"
-
+
 def __init__(self, configDict):
 """__init__() -> FBlender"""
 FApplication.__init__(self, configDict)
@@ -25,41 +26,39 @@
 self.__testRenderCount = 0
 self.__blenderCommandLine = None
 self.__workingDir = None
-
+
 def GetPrettyName(self):
 """GetPrettyName() -> str
-
+
 Implements FApplication.GetPrettyName()
-
+
 """
-return "Blender 2.59"
-
+return "Blender 2.68a"
+
 def GetSettingsForOperation(self, operation):
 """GetSettingsForOperation(operation) -> list_of_FSettingEntry
-
+
 Implements FApplication.GetSettingsForOperation()
 
-   TODO: Figure out how we can/should use these, esp. for animation tests
-
 """
 if (operation == IMPORT):
 return []
 elif (operation == EXPORT):
 return []
-elif (operation == RENDER): 
+elif (operation == RENDER):
 return []
 else:
 return []
-
+
 def BeginScript(self, workingDir):
 """BeginScript(workingDir) -> None'
-
+
 Implements FApplication.BeginScript()
-
+
 """
-pyFilename = ("script" + str(self.applicationIndex) + 
+pyFilename = ("script" + str(self.applicationIndex) +
 FBlender.__SCRIPT_EXTENSION)
-blenderPyFilename = ("blenderScript" + str(self.applicationIndex) + 
+blenderPyFilename = ("blenderScript" + str(self.applicationIndex) +
 FBlender.__SCRIPT_EXTENSION)
 self.__script = open(os.path.join(workingDir, pyFilename), "w")
 self.__blenderScript = open(os.path.join(workingDir, 
blenderPyFilename), "w")
@@ -71,21 +70,21 @@
 import sys
 
 import_dae = sys.argv[-1]
+default_dae = sys.argv[-4]
 export_dae = sys.argv[-3]
-default_dae = sys.argv[-4]
 
 print("default .dea for testing: {}\\n".format(default_dae))
 
 print("importing: {}\\n".format(import_dae))
 img=sys.argv[-2]
 img=img.replace("", "")
-bpy.ops.wm.collada_import(filepath=import_dae)
+bpy.ops.wm.collada_import(filepath=import_dae, import_units=True)
 for o in bpy.data.objects:
 print("\\t{}\\n".format(o.name))
 
 if len(bpy.data.cameras)==0:
 print("no camera found, importing {}".format(default_dae))
-bpy.ops.wm.collada_import(filepath=default_dae)
+bpy.ops.wm.collada_import(filepath=default_dae, import_units=True)
 for o in bpy.data.objects:
 o.select = True if o.name == 'delete_me' else False
 print("cleaning after {} import".format(default_dae))
@@ -106,7 +105,7 @@
 bpy.data.scenes[0].render.resolution_y = 512
 bpy.data.scenes[0].render.resolution_percentage = 100
 bpy.data.scenes[0].render.use_antialiasing = False
-bpy.data.scenes[0].render.alpha_mode = 'STRAIGHT'
+bpy.data.scenes[0].render.alpha_mode = 'TRANSPARENT'
 
 bpy.ops.render.render(animation=False, write_still=True)
 
@@ -114,98 +113,99 @@
 
 print("\\n\\ndone testing.\\n\\n")"""
 )
-
+
 self.__testImportCount = 0
 self.__testRenderCount = 0
 self.__workingDir = workingDir
-
+
 def EndScript(self):
 """EndScript() -> None
-
+
 Implements FApplication.EndScript()
-
+
 """
 self.__blenderScript.close()
 self.__script.close()
-
+
 def RunScript(self):
 """RunScript() -> None
-
+
 Implements FAppli

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60084] trunk/blender/source/blender/ makesdna/DNA_customdata_types.h: Change the enum for CustomDataMask bits back to #defines.

[Nathan Letwory]

Revision: 60084
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60084
Author:   jesterking
Date: 2013-09-12 20:43:29 + (Thu, 12 Sep 2013)
Log Message:
---
Change the enum for CustomDataMask bits back to #defines.

enum is an int, and values from CD_PREVIEW_MLOOPCOL (32) onwards
will not give what apparently was expected.

Found with help from Oscurart in #blendercoders while trying to figure
out compile error with CMake/msvc9. Occasionally it is good to heed
the warnings given by compilers!

Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_customdata_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h
2013-09-12 20:33:02 UTC (rev 60083)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h
2013-09-12 20:43:29 UTC (rev 60084)
@@ -121,49 +121,47 @@
 };
 
 /* Bits for CustomDataMask */
-enum {
-   CD_MASK_MVERT= (1LL << CD_MVERT),
-   CD_MASK_MSTICKY  = (1LL << CD_MSTICKY),  /* DEPRECATED */
-   CD_MASK_MDEFORMVERT  = (1LL << CD_MDEFORMVERT),
-   CD_MASK_MEDGE= (1LL << CD_MEDGE),
-   CD_MASK_MFACE= (1LL << CD_MFACE),
-   CD_MASK_MTFACE   = (1LL << CD_MTFACE),
-   CD_MASK_MCOL = (1LL << CD_MCOL),
-   CD_MASK_ORIGINDEX= (1LL << CD_ORIGINDEX),
-   CD_MASK_NORMAL   = (1LL << CD_NORMAL),
-/* CD_MASK_POLYINDEX= (1LL << CD_POLYINDEX), */
-   CD_MASK_PROP_FLT = (1LL << CD_PROP_FLT),
-   CD_MASK_PROP_INT = (1LL << CD_PROP_INT),
-   CD_MASK_PROP_STR = (1LL << CD_PROP_STR),
-   CD_MASK_ORIGSPACE= (1LL << CD_ORIGSPACE),
-   CD_MASK_ORCO = (1LL << CD_ORCO),
-   CD_MASK_MTEXPOLY = (1LL << CD_MTEXPOLY),
-   CD_MASK_MLOOPUV  = (1LL << CD_MLOOPUV),
-   CD_MASK_MLOOPCOL = (1LL << CD_MLOOPCOL),
-   CD_MASK_TANGENT  = (1LL << CD_TANGENT),
-   CD_MASK_MDISPS   = (1LL << CD_MDISPS),
-   CD_MASK_PREVIEW_MCOL = (1LL << CD_PREVIEW_MCOL),
-   CD_MASK_CLOTH_ORCO   = (1LL << CD_CLOTH_ORCO),
-   CD_MASK_RECAST   = (1LL << CD_RECAST),
+#define CD_MASK_MVERT  (1 << CD_MVERT)
+#define CD_MASK_MSTICKY(1 << CD_MSTICKY)  /* DEPRECATED */
+#define CD_MASK_MDEFORMVERT(1 << CD_MDEFORMVERT)
+#define CD_MASK_MEDGE  (1 << CD_MEDGE)
+#define CD_MASK_MFACE  (1 << CD_MFACE)
+#define CD_MASK_MTFACE (1 << CD_MTFACE)
+#define CD_MASK_MCOL   (1 << CD_MCOL)
+#define CD_MASK_ORIGINDEX  (1 << CD_ORIGINDEX)
+#define CD_MASK_NORMAL (1 << CD_NORMAL)
+// #define CD_MASK_POLYINDEX   (1 << CD_POLYINDEX)
+#define CD_MASK_PROP_FLT   (1 << CD_PROP_FLT)
+#define CD_MASK_PROP_INT   (1 << CD_PROP_INT)
+#define CD_MASK_PROP_STR   (1 << CD_PROP_STR)
+#define CD_MASK_ORIGSPACE  (1 << CD_ORIGSPACE)
+#define CD_MASK_ORCO   (1 << CD_ORCO)
+#define CD_MASK_MTEXPOLY   (1 << CD_MTEXPOLY)
+#define CD_MASK_MLOOPUV(1 << CD_MLOOPUV)
+#define CD_MASK_MLOOPCOL   (1 << CD_MLOOPCOL)
+#define CD_MASK_TANGENT(1 << CD_TANGENT)
+#define CD_MASK_MDISPS (1 << CD_MDISPS)
+#define CD_MASK_PREVIEW_MCOL   (1 << CD_PREVIEW_MCOL)
+#define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO)
+#define CD_MASK_RECAST (1 << CD_RECAST)
 
 /* BMESH ONLY START */
-   CD_MASK_MPOLY= (1LL << CD_MPOLY),
-   CD_MASK_MLOOP= (1LL << CD_MLOOP),
-   CD_MASK_SHAPE_KEYINDEX   = (1LL << CD_SHAPE_KEYINDEX),
-   CD_MASK_SHAPEKEY = (1LL << CD_SHAPEKEY),
-   CD_MASK_BWEIGHT  = (1LL << CD_BWEIGHT),
-   CD_MASK_CREASE   = (1LL << CD_CREASE),
-   CD_MASK_ORIGSPACE_MLOOP  = (1LL << CD_ORIGSPACE_MLOOP),
-   CD_MASK_PREVIEW_MLOOPCOL = (1LL << CD_PREVIEW_MLOOPCOL),
-   CD_MASK_BM_ELEM_PYPTR= (1LL << CD_BM_ELEM_PYPTR),
+#define CD_MASK_MPOLY  (1 << CD_MPOLY)
+#define CD_MASK_MLOOP  (1 << CD_MLOOP)
+#define CD_MASK_SHAPE_KEYINDEX (1 << CD_SHAPE_KEYINDEX)
+#define CD_MASK_SHAPEKEY   (1 << CD_SHAPEKEY)
+#define CD_MASK_BWEIGHT(1 << CD_BWEIGHT)
+#define CD_MASK_CREASE (1 << CD_CREASE)
+#define CD_MASK_ORIGSPACE_MLOOP(1LL << CD_ORIGSPACE_MLOOP)
+#define CD_MASK_PREVIEW_MLOOPCOL (1LL << CD_PREVIEW_MLOOPCOL)
+#define CD_MASK_BM_ELEM_PYPTR (1LL << CD_BM_ELEM_PYPTR)
 /* BMESH ONLY END */
 
-   CD_MASK_PAINT_MASK   = (1LL << CD_PAINT_MASK),
-   CD_MASK_GRID_PAINT_MASK  = (1LL << CD_GRID_PAINT_MASK),
-   CD_MASK_MVERT_SKIN   = (1LL << CD_MVERT_SKIN),
-   CD_MASK_FREESTYLE_EDGE   = (1LL << CD_FREESTYLE_EDGE),
-   CD_MASK_FREESTYLE_FACE   = (1LL << CD_FREESTYLE_FACE),
-};
+#define CD_MASK_PA

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60067] trunk/blender/intern/ghost/intern/ GHOST_WindowWin32.cpp: Fix for [#36707] Blender Opens in fullscreen and stays like that

[Nathan Letwory]

Revision: 60067
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60067
Author:   jesterking
Date: 2013-09-12 10:44:03 + (Thu, 12 Sep 2013)
Log Message:
---
Fix for [#36707] Blender Opens in fullscreen and stays like that
Reported by holy enigma

The previous commit in this area removed bounding box checks, because
they were done against primary monitor. Now do bound checks against
the entire desktop, or rather, the virtual screen. This is the bounding
rectangle of all the monitors.

This should ensure windows are always created within the confines of this
area.

Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-12 
10:41:00 UTC (rev 60066)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-12 
10:44:03 UTC (rev 60067)
@@ -176,33 +176,44 @@
}
 
if (state != GHOST_kWindowStateFullScreen) {
-   RECT rect;
+   RECT rect, desktop;
+   int wintype = WS_OVERLAPPEDWINDOW;
 
-   int framex = GetSystemMetrics(SM_CXSIZEFRAME);
-   int framey = GetSystemMetrics(SM_CYSIZEFRAME);
-   int caption = GetSystemMetrics(SM_CYCAPTION);
-   width += framex * 2;
-   height += framey * 2 + caption;
-
-   left -= framex;
-   top -= (caption+framey);
-
-   rect.left = left;
-   rect.right = left + width + framex;
-   rect.top = top;
-   rect.bottom = top + height + caption - framey;
-
-   int wintype = WS_OVERLAPPEDWINDOW;
if (m_parentWindowHwnd != 0)
{
wintype = WS_CHILD;
+   /* check against parent window if given */
GetWindowRect((HWND)m_parentWindowHwnd, &rect);
-   left = 0;
-   top = 0;
-   width = rect.right - rect.left;
-   height = rect.bottom - rect.top;
+   } else {
+   int framex = GetSystemMetrics(SM_CXSIZEFRAME);
+   int framey = GetSystemMetrics(SM_CYSIZEFRAME);
+   int caption = GetSystemMetrics(SM_CYCAPTION);
+
+   /* set up total window rect, taking in account window 
decorations. */
+   rect.left = left - framex;
+   rect.right = rect.left + width + framex*2;
+   rect.top = top - (caption + framey);
+   rect.bottom = rect.top + height + (caption + framey * 
2);
}
-   
+
+   /* ask how large virtual screen is */
+   desktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
+   desktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
+   desktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+   desktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+   /* virtual screen (desktop) bound checks */
+   if(rect.left < desktop.left) rect.left = desktop.left;
+   if(rect.top < desktop.top) rect.top = desktop.top;
+   if(rect.bottom > desktop.bottom) rect.bottom = desktop.bottom;
+   if(rect.right > desktop.right) rect.right = desktop.right;
+
+   /* dimension vars to use in window creation */
+   left = rect.left;
+   top = rect.top;
+   width = rect.right - rect.left;
+   height = rect.bottom - rect.top;
+
wchar_t *title_16 = alloc_utf16_from_8((char *)(const char 
*)title, 0);
m_hWnd = ::CreateWindowW(
s_windowClassName,  // pointer to registered class 
name

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60046] trunk/blender/intern/ghost/intern/ GHOST_WindowWin32.cpp: Fix [#36702] blenderapplication window position and size

[Nathan Letwory]

Revision: 60046
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60046
Author:   jesterking
Date: 2013-09-11 14:14:18 + (Wed, 11 Sep 2013)
Log Message:
---
Fix [#36702] blenderapplication window position and size

On Windows the system window will be sized an positioned such that Blender 
screen area lower left
corner is at the requested location, and with dimension as requested.

Thanks to Alexander N. for reporting and Brecht van Lommel for input.

Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-11 
12:13:20 UTC (rev 60045)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-11 
14:14:18 UTC (rev 60046)
@@ -178,10 +178,19 @@
if (state != GHOST_kWindowStateFullScreen) {
RECT rect;
 
+   int framex = GetSystemMetrics(SM_CXSIZEFRAME);
+   int framey = GetSystemMetrics(SM_CYSIZEFRAME);
+   int caption = GetSystemMetrics(SM_CYCAPTION);
+   width += framex * 2;
+   height += framey * 2 + caption;
+
+   left -= framex;
+   top -= (caption+framey);
+
rect.left = left;
-   rect.right = left + width;
+   rect.right = left + width + framex;
rect.top = top;
-   rect.bottom = top + height;
+   rect.bottom = top + height + caption - framey;
 
int wintype = WS_OVERLAPPEDWINDOW;
if (m_parentWindowHwnd != 0)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60036] trunk/blender/source/blender/ makesrna/intern: Add read-only access to index data for current line, top line and visible lines count.

[Nathan Letwory]

Revision: 60036
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60036
Author:   jesterking
Date: 2013-09-11 07:23:23 + (Wed, 11 Sep 2013)
Log Message:
---
Add read-only access to index data for current line, top line and visible lines 
count.

Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_text.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_space.c2013-09-11 
07:10:15 UTC (rev 60035)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c2013-09-11 
07:23:23 UTC (rev 60036)
@@ -2595,6 +2595,16 @@
RNA_def_property_ui_text(prop, "Margin Column", "Column number to show 
right margin at");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TEXT, NULL);
 
+   prop = RNA_def_property(srna, "top", PROP_INT, PROP_NONE);
+   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+   RNA_def_property_int_sdna(prop, NULL, "top");
+   RNA_def_property_ui_text(prop, "Top Line", "Top line visible.");
+
+   prop = RNA_def_property(srna, "visible_lines", PROP_INT, PROP_NONE);
+   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+   RNA_def_property_int_sdna(prop, NULL, "viewlines");
+   RNA_def_property_ui_text(prop, "Top Line", "Amount of lines that can be 
visible in current editor");
+
/* functionality options */
prop = RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overwrite", 1);

Modified: trunk/blender/source/blender/makesrna/intern/rna_text.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_text.c 2013-09-11 
07:10:15 UTC (rev 60035)
+++ trunk/blender/source/blender/makesrna/intern/rna_text.c 2013-09-11 
07:23:23 UTC (rev 60036)
@@ -81,6 +81,19 @@
return text_file_modified(text);
 }
 
+static int rna_Text_current_line_index_get(PointerRNA *ptr)
+{
+   Text *text = (Text *)ptr->data;
+   TextLine *linep = text->lines.first;
+   int i = 0;
+   while(linep) {
+   if(text->curl==linep) break;
+   linep = linep->next;
+   i++;
+   }
+   return i;
+}
+
 static void rna_TextLine_body_get(PointerRNA *ptr, char *value)
 {
TextLine *line = (TextLine *)ptr->data;
@@ -141,6 +154,11 @@
RNA_def_struct_ui_text(srna, "Text", "Text datablock referencing an 
external or packed text file");
RNA_def_struct_ui_icon(srna, ICON_TEXT);
RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
+
+   prop = RNA_def_property(srna, "current_line_index", PROP_INT, 
PROP_NONE);
+   RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+   RNA_def_property_int_funcs(prop, "rna_Text_current_line_index_get", 
NULL, NULL);
+   RNA_def_property_ui_text(prop, "Current Line Index", "Index of current 
TextLine in TextLine collection");

prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_NONE);
RNA_def_property_string_funcs(prop, "rna_Text_filename_get", 
"rna_Text_filename_length", "rna_Text_filename_set");

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59986] trunk/blender/intern/ghost/intern/ GHOST_WindowWin32.cpp: Remove dimension checks from window creation.

[Nathan Letwory]

Revision: 59986
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59986
Author:   jesterking
Date: 2013-09-10 06:35:50 + (Tue, 10 Sep 2013)
Log Message:
---
Remove dimension checks from window creation.

This should be (and is) done by the caller instead (windowmanager)
to ensure new windows fit properly on the desktop. Saving
stretched layouts and layouts with window over display 
boundaries now becomes possible on Windows too.

Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-10 
06:32:32 UTC (rev 59985)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-10 
06:35:50 UTC (rev 59986)
@@ -177,46 +177,12 @@
 
if (state != GHOST_kWindowStateFullScreen) {
RECT rect;
-   MONITORINFO monitor;
-   GHOST_TUns32 tw, th; 
 
-   width += GetSystemMetrics(SM_CXSIZEFRAME) * 2;
-   height += GetSystemMetrics(SM_CYSIZEFRAME) * 2 + 
GetSystemMetrics(SM_CYCAPTION);
-
rect.left = left;
rect.right = left + width;
rect.top = top;
rect.bottom = top + height;
 
-   monitor.cbSize = sizeof(monitor);
-   monitor.dwFlags = 0;
-
-   // take taskbar into account
-   GetMonitorInfo(MonitorFromRect(&rect, 
MONITOR_DEFAULTTONEAREST), &monitor);
-
-   th = monitor.rcWork.bottom - monitor.rcWork.top;
-   tw = monitor.rcWork.right - monitor.rcWork.left;
-
-   if (tw < width)
-   {
-   width = tw;
-   left = monitor.rcWork.left;
-   }
-   else if (monitor.rcWork.right < left + (int)width)
-   left = monitor.rcWork.right - width;
-   else if (left < monitor.rcWork.left)
-   left = monitor.rcWork.left;
-
-   if (th < height)
-   {
-   height = th;
-   top = monitor.rcWork.top;
-   }
-   else if (monitor.rcWork.bottom < top + (int)height)
-   top = monitor.rcWork.bottom - height;
-   else if (top < monitor.rcWork.top)
-   top = monitor.rcWork.top;
-
int wintype = WS_OVERLAPPEDWINDOW;
if (m_parentWindowHwnd != 0)
{

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59985] trunk/blender/source/blender/ windowmanager: Change window checks to desktop size instead of screen size.

[Nathan Letwory]

Revision: 59985
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59985
Author:   jesterking
Date: 2013-09-10 06:32:32 + (Tue, 10 Sep 2013)
Log Message:
---
Change window checks to desktop size instead of screen size.

This allows to open windows stretched over monitors. Saving
stretched layouts open correctly as well.

Renamed screensize_all to desktopsize to better convey meaning.

Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_window.h

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c   
2013-09-10 05:57:54 UTC (rev 59984)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c   
2013-09-10 06:32:32 UTC (rev 59985)
@@ -114,8 +114,8 @@
*height_r = uiheight;
 }
 
-/* size of all screens, useful since the mouse is bound by this */
-void wm_get_screensize_all(int *width_r, int *height_r)
+/* size of all screens (desktop), useful since the mouse is bound by this */
+void wm_get_desktopsize(int *width_r, int *height_r)
 {
unsigned int uiwidth;
unsigned int uiheight;
@@ -131,7 +131,7 @@
 {
int width, height, d;

-   wm_get_screensize(&width, &height);
+   wm_get_desktopsize(&width, &height);

 #if defined(__APPLE__) && !defined(GHOST_COCOA)
height -= 70;
@@ -359,7 +359,7 @@
if (multisamples == -1)
multisamples = U.ogl_multisamples;

-   wm_get_screensize(&scr_w, &scr_h);
+   wm_get_desktopsize(&scr_w, &scr_h);
posy = (scr_h - win->posy - win->sizey);

ghostwin = GHOST_CreateWindow(g_system, title,
@@ -856,7 +856,7 @@

GHOST_DisposeRectangle(client_rect);

-   wm_get_screensize_all(&scr_w, &scr_h);
+   wm_get_desktopsize(&scr_w, &scr_h);
sizex = r - l;
sizey = b - t;
posx = l;

Modified: trunk/blender/source/blender/windowmanager/wm_window.h
===
--- trunk/blender/source/blender/windowmanager/wm_window.h  2013-09-10 
05:57:54 UTC (rev 59984)
+++ trunk/blender/source/blender/windowmanager/wm_window.h  2013-09-10 
06:32:32 UTC (rev 59985)
@@ -40,7 +40,7 @@
 void   wm_ghost_exit(void);
 
 void wm_get_screensize(int *width_r, int *height_r);
-void wm_get_screensize_all(int *width_r, int *height_r);
+void wm_get_desktopsize(int *width_r, int *height_r);
 
 wmWindow   *wm_window_new  (bContext *C);
 void   wm_window_free  (bContext *C, wmWindowManager 
*wm, wmWindow *win);

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59984] trunk/blender/source/blender/imbuf /intern/allocimbuf.c: Add BLI_utildefines.h for __func__ ( necessary for MSVC).

[Nathan Letwory]

Revision: 59984
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59984
Author:   jesterking
Date: 2013-09-10 05:57:54 + (Tue, 10 Sep 2013)
Log Message:
---
Add BLI_utildefines.h for __func__ (necessary for MSVC).

Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/allocimbuf.c

Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c  2013-09-10 
03:18:43 UTC (rev 59983)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c  2013-09-10 
05:57:54 UTC (rev 59984)
@@ -48,6 +48,8 @@
 #include "MEM_guardedalloc.h"
 #include "MEM_CacheLimiterC-Api.h"
 
+#include "BLI_utildefines.h"
+
 void imb_freemipmapImBuf(ImBuf *ibuf)
 {
int a;

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59818] trunk/blender/source/blender/ collada: Apply patch [#36601].

[Nathan Letwory]

Revision: 59818
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59818
Author:   jesterking
Date: 2013-09-05 06:58:27 + (Thu, 05 Sep 2013)
Log Message:
---
Apply patch [#36601].
Submitted by Saurabh Wankhade (sauraedron).

This patch adds camera shift and dof export and import in a Blender profile.

Modified Paths:
--
trunk/blender/source/blender/collada/CameraExporter.cpp
trunk/blender/source/blender/collada/CameraExporter.h
trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/CameraExporter.cpp
===
--- trunk/blender/source/blender/collada/CameraExporter.cpp 2013-09-05 
04:26:08 UTC (rev 59817)
+++ trunk/blender/source/blender/collada/CameraExporter.cpp 2013-09-05 
06:58:27 UTC (rev 59818)
@@ -63,7 +63,6 @@
 }
 void CamerasExporter::operator()(Object *ob, Scene *sce)
 {
-   // TODO: shiftx, shifty, YF_dofdist
Camera *cam = (Camera *)ob->data;
std::string cam_id(get_camera_id(ob));
std::string cam_name(id_name(cam));
@@ -78,7 +77,9 @@
persp.setZFar(cam->clipend, false, "zfar");
persp.setZNear(cam->clipsta, false, "znear");
COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
+   exportBlenderProfile(ccam, cam);
addCamera(ccam);
+
break;
}
case CAM_ORTHO:
@@ -90,8 +91,17 @@
ortho.setZFar(cam->clipend, false, "zfar");
ortho.setZNear(cam->clipsta, false, "znear");
COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
+   exportBlenderProfile(ccam, cam);
addCamera(ccam);
break;
}
}
 }
+bool CamerasExporter::exportBlenderProfile(COLLADASW::Camera &cm,Camera *cam)
+{
+   cm.addExtraTechniqueParameter("blender","shiftx",cam->shiftx);
+   cm.addExtraTechniqueParameter("blender","shifty",cam->shifty);
+   cm.addExtraTechniqueParameter("blender","YF_dofdist",cam->YF_dofdist);
+   return true;
+
+}

Modified: trunk/blender/source/blender/collada/CameraExporter.h
===
--- trunk/blender/source/blender/collada/CameraExporter.h   2013-09-05 
04:26:08 UTC (rev 59817)
+++ trunk/blender/source/blender/collada/CameraExporter.h   2013-09-05 
06:58:27 UTC (rev 59818)
@@ -37,6 +37,7 @@
 }
 
 #include "ExportSettings.h"
+#include "DNA_camera_types.h"
 
 class CamerasExporter: COLLADASW::LibraryCameras
 {
@@ -45,6 +46,7 @@
void exportCameras(Scene *sce);
void operator()(Object *ob, Scene *sce);
 private:
+   bool exportBlenderProfile(COLLADASW::Camera &cla,Camera *cam);
const ExportSettings *export_settings;
 };
 

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===
--- trunk/blender/source/blender/collada/DocumentImporter.cpp   2013-09-05 
04:26:08 UTC (rev 59817)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp   2013-09-05 
06:58:27 UTC (rev 59818)
@@ -933,6 +933,7 @@
Camera *cam = NULL;
std::string cam_id, cam_name;

+   ExtraTags *et=getExtraTags(camera->getUniqueId());
cam_id = camera->getOriginalId();
cam_name = camera->getName();
if (cam_name.size()) cam = (Camera *)BKE_camera_add(G.main, (char 
*)cam_name.c_str());
@@ -942,6 +943,12 @@
fprintf(stderr, "Cannot create camera.\n");
return true;
}
+
+   if(et && et->isProfile("blender")) {
+   et->setData("shiftx",&(cam->shiftx));
+   et->setData("shifty",&(cam->shifty));
+   et->setData("YF_dofdist",&(cam->YF_dofdist));
+   }
cam->clipsta = camera->getNearClippingPlane().getValue();
cam->clipend = camera->getFarClippingPlane().getValue();


___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59799] trunk/blender/intern/ghost/intern/ GHOST_WindowWin32.cpp: Add new cursor types to data handling to account for Intuos 4 device ( pen and erase

[Nathan Letwory]

Revision: 59799
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59799
Author:   jesterking
Date: 2013-09-04 12:10:02 + (Wed, 04 Sep 2013)
Log Message:
---
Add new cursor types to data handling to account for Intuos 4 device (pen and 
eraser).

Thanks to Ayden Polat for helping to find out the cursor type codes.

Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-04 
11:56:14 UTC (rev 59798)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-04 
12:10:02 UTC (rev 59799)
@@ -1135,10 +1135,12 @@
break;
case 1:
case 4:
+   case 7:
m_tabletData->Active = 
GHOST_kTabletModeStylus; /* stylus */
break;
case 2:
case 5:
+   case 8:
m_tabletData->Active = 
GHOST_kTabletModeEraser; /* eraser */
break;
}

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57611] trunk/blender/build_files/buildbot /slave_compile.py: Move DLL copying to before actual build process.

[Nathan Letwory]

Revision: 57611
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57611
Author:   jesterking
Date: 2013-06-20 14:19:46 + (Thu, 20 Jun 2013)
Log Message:
---
Move DLL copying to before actual build process.

Modified Paths:
--
trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===
--- trunk/blender/build_files/buildbot/slave_compile.py 2013-06-20 13:52:58 UTC 
(rev 57610)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2013-06-20 14:19:46 UTC 
(rev 57611)
@@ -155,9 +155,9 @@
 
 scons_options.append('BF_CONFIG=' + os.path.join(config_dir, 
config))
 
-retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
-
 if builder.find('win') != -1:
+if not os.path.exists(install_dir):
+os.makedirs(install_dir)
 if builder.endswith('vc2012'):
 dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
 else:
@@ -169,4 +169,6 @@
 for dll in dlls:
 shutil.copyfile(os.path.join(dlls_path, dll), 
os.path.join(install_dir, dll))
 
+retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
 sys.exit(retcode)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57511] trunk/blender/build_files/scons/ tools/btools.py: Only printing errors.

[Nathan Letwory]

Revision: 57511
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57511
Author:   jesterking
Date: 2013-06-16 20:36:34 + (Sun, 16 Jun 2013)
Log Message:
---
Only printing errors.

(No news is good news).

Modified Paths:
--
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2013-06-16 20:34:29 UTC 
(rev 57510)
+++ trunk/blender/build_files/scons/tools/btools.py 2013-06-16 20:36:34 UTC 
(rev 57511)
@@ -233,8 +233,6 @@
 stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, 
env=env)
 data, err = proc.communicate()
 rv = proc.wait()
-if data:
-print(data)
 if err:
 print(err)
 return rv

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57510] trunk/blender/SConstruct: Since upgrade to SCons 2.3. 0 a small change is needed to ensure 32bit is targeted properly when

[Nathan Letwory]

Revision: 57510
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57510
Author:   jesterking
Date: 2013-06-16 20:34:29 + (Sun, 16 Jun 2013)
Log Message:
---
Since upgrade to SCons 2.3.0 a small change is needed to ensure 32bit is 
targeted properly when
building 32bit Blender with 64bit compiler installed as well (MSVC).

Modified Paths:
--
trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2013-06-16 18:59:50 UTC (rev 57509)
+++ trunk/blender/SConstruct2013-06-16 20:34:29 UTC (rev 57510)
@@ -148,9 +148,9 @@
 btools.SetupSpawn(env)
 else:
 if bitness==64 and platform=='win32':
-env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', 
TARGET_ARCH='x86_64')
 else:
-env = BlenderEnvironment(ENV = os.environ)
+env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
 
 if not env:
 print "Could not create a build environment"

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57485] trunk/blender: Set up OurSpawn for MinGW compile environment on Windows.

[Nathan Letwory]

Revision: 57485
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57485
Author:   jesterking
Date: 2013-06-15 21:20:06 + (Sat, 15 Jun 2013)
Log Message:
---
Set up OurSpawn for MinGW compile environment on Windows.

Modified Paths:
--
trunk/blender/SConstruct
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2013-06-15 21:15:23 UTC (rev 57484)
+++ trunk/blender/SConstruct2013-06-15 21:20:06 UTC (rev 57485)
@@ -46,9 +46,7 @@
 import os.path
 import string
 import shutil
-import glob
 import re
-from tempfile import mkdtemp
 
 # store path to tools
 toolpath=os.path.join(".", "build_files", "scons", "tools")
@@ -58,7 +56,6 @@
 
 import Blender
 import btools
-import bcolors
 
 EnsureSConsVersion(1,0,0)
 
@@ -121,7 +118,7 @@
 
 if bitness:
 B.bitness = bitness
-else: 
+else:
 B.bitness = tempbitness
 
 
@@ -172,6 +169,10 @@
 elif env['CC'] in ['gcc']:
 platform = 'win64-mingw' if bitness == 64 else 'win32-mingw'
 
+if 'mingw' in platform:
+print "Setting custom spawn function"
+btools.SetupSpawn(env)
+
 env.SConscriptChdir(0)
 
 # Remove major kernel version from linux platform.
@@ -303,7 +304,7 @@
 
env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
 env['BF_3DMOUSE_INC'] = 
'/Library/Frameworks/3DconnexionClient.framework/Headers'
 
-# for now, Mac builders must download and install the JackOSX framework 
+# for now, Mac builders must download and install the JackOSX framework
 # necessary header file lives here when installed:
 # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
 if env['WITH_BF_JACK'] == 1:
@@ -313,13 +314,13 @@
 else:
 
env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
 
-if env['WITH_BF_CYCLES_OSL'] == 1: 
+if env['WITH_BF_CYCLES_OSL'] == 1:
 OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
 # we need 2 variants of passing the oslexec with the force_load 
option, string and list type atm
 env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ 
OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
 
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH
 +'/liboslexec.a'])
 
-# Trying to get rid of eventually clashes, we export some explicite as 
local symbols   
+# Trying to get rid of eventually clashes, we export some explicite as 
local symbols
 
env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
 
 if env['WITH_BF_OPENMP'] == 1:
@@ -330,10 +331,10 @@
 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
 env['CCFLAGS'].append('-openmp')
 else:
-env.Append(CCFLAGS=['-fopenmp']) 
+env.Append(CCFLAGS=['-fopenmp'])
 
 if env['WITH_GHOST_COCOA'] == True:
-env.Append(CPPFLAGS=['-DGHOST_COCOA']) 
+env.Append(CPPFLAGS=['-DGHOST_COCOA'])
 
 if env['USE_QTKIT'] == True:
 env.Append(CPPFLAGS=['-DUSE_QTKIT'])
@@ -370,7 +371,7 @@
 
 # build with ocean sim?
 if env['WITH_BF_OCEANSIM'] == 1:
-env['WITH_BF_FFTW3']  = 1  # ocean needs fftw3 so enable it 
+env['WITH_BF_FFTW3']  = 1  # ocean needs fftw3 so enable it
 env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
 
 
@@ -517,10 +518,10 @@
filename_only = os.path.basename(FILE_FROM)
FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
-   
+
data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
-   
 
+
 if B.targets != ['cudakernels']:
 data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
   B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
@@ -960,7 +961,7 @@
 
 else:
 dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
-   
+
 dllsources.append('#source/icons/blender.exe.manifest')
 
 windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -990,7 +991,7 @@
 
 if(env['WITH_BF_OPENMP']):
 dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
-   
+
 if env['WITH_BF_OCIO']:
 dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
 

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2013-06-15 21:15:23 UTC 
(rev 57484)
+++ trunk/blender/build_files/scons/tools/btools.py 2013-06-15 21:20:06 UTC 
(rev 57485)
@@ -8,7 +8,6 @@
 except ImportError:
 pass
 import string
-import glob
 imp

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57479] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix [#35728] "Load Factory Settings" changes temp fonder to "/temp/\"

[Nathan Letwory]

Revision: 57479
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57479
Author:   jesterking
Date: 2013-06-15 20:12:16 + (Sat, 15 Jun 2013)
Log Message:
---
Fix [#35728] "Load Factory Settings" changes temp fonder to "/temp/\"

This was actually being reset to "/tmp\".

Initialisation for the temp dir was missing after the userpref reload.

Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2013-06-15 19:52:45 UTC (rev 57478)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2013-06-15 20:12:16 UTC (rev 57479)
@@ -540,6 +540,7 @@
if (success == 0) {
success = BKE_read_file_from_memory(C, datatoc_startup_blend, 
datatoc_startup_blend_size, NULL);
if (wmbase.first == NULL) wm_clear_default_size(C);
+   BLI_init_temporary_dir(U.tempdir);
 
 #ifdef WITH_PYTHON_SECURITY
/* use alternative setting for security nuts

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57478] trunk/blender/scons: Long overdue update for our bundled SCons version, from 1.2.0 (20090223) to current stable 2.3.0.

[Nathan Letwory]

Revision: 57478
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57478
Author:   jesterking
Date: 2013-06-15 19:52:45 + (Sat, 15 Jun 2013)
Log Message:
---
Long overdue update for our bundled SCons version, from 1.2.0 (20090223) to 
current stable 2.3.0.

Modified Paths:
--
trunk/blender/scons/scons-time.py
trunk/blender/scons/scons.py
trunk/blender/scons/sconsign.py

Added Paths:
---
trunk/blender/scons/scons-local/
trunk/blender/scons/scons-local/SCons/
trunk/blender/scons/scons-local/SCons/Action.py
trunk/blender/scons/scons-local/SCons/Builder.py
trunk/blender/scons/scons-local/SCons/CacheDir.py
trunk/blender/scons/scons-local/SCons/Conftest.py
trunk/blender/scons/scons-local/SCons/Debug.py
trunk/blender/scons/scons-local/SCons/Defaults.py
trunk/blender/scons/scons-local/SCons/Environment.py
trunk/blender/scons/scons-local/SCons/Errors.py
trunk/blender/scons/scons-local/SCons/Executor.py
trunk/blender/scons/scons-local/SCons/Job.py
trunk/blender/scons/scons-local/SCons/Memoize.py
trunk/blender/scons/scons-local/SCons/Node/
trunk/blender/scons/scons-local/SCons/Node/Alias.py
trunk/blender/scons/scons-local/SCons/Node/FS.py
trunk/blender/scons/scons-local/SCons/Node/Python.py
trunk/blender/scons/scons-local/SCons/Node/__init__.py
trunk/blender/scons/scons-local/SCons/Options/
trunk/blender/scons/scons-local/SCons/Options/BoolOption.py
trunk/blender/scons/scons-local/SCons/Options/EnumOption.py
trunk/blender/scons/scons-local/SCons/Options/ListOption.py
trunk/blender/scons/scons-local/SCons/Options/PackageOption.py
trunk/blender/scons/scons-local/SCons/Options/PathOption.py
trunk/blender/scons/scons-local/SCons/Options/__init__.py
trunk/blender/scons/scons-local/SCons/PathList.py
trunk/blender/scons/scons-local/SCons/Platform/
trunk/blender/scons/scons-local/SCons/Platform/__init__.py
trunk/blender/scons/scons-local/SCons/Platform/aix.py
trunk/blender/scons/scons-local/SCons/Platform/cygwin.py
trunk/blender/scons/scons-local/SCons/Platform/darwin.py
trunk/blender/scons/scons-local/SCons/Platform/hpux.py
trunk/blender/scons/scons-local/SCons/Platform/irix.py
trunk/blender/scons/scons-local/SCons/Platform/os2.py
trunk/blender/scons/scons-local/SCons/Platform/posix.py
trunk/blender/scons/scons-local/SCons/Platform/sunos.py
trunk/blender/scons/scons-local/SCons/Platform/win32.py
trunk/blender/scons/scons-local/SCons/SConf.py
trunk/blender/scons/scons-local/SCons/SConsign.py
trunk/blender/scons/scons-local/SCons/Scanner/
trunk/blender/scons/scons-local/SCons/Scanner/C.py
trunk/blender/scons/scons-local/SCons/Scanner/D.py
trunk/blender/scons/scons-local/SCons/Scanner/Dir.py
trunk/blender/scons/scons-local/SCons/Scanner/Fortran.py
trunk/blender/scons/scons-local/SCons/Scanner/IDL.py
trunk/blender/scons/scons-local/SCons/Scanner/LaTeX.py
trunk/blender/scons/scons-local/SCons/Scanner/Prog.py
trunk/blender/scons/scons-local/SCons/Scanner/RC.py
trunk/blender/scons/scons-local/SCons/Scanner/__init__.py
trunk/blender/scons/scons-local/SCons/Script/
trunk/blender/scons/scons-local/SCons/Script/Interactive.py
trunk/blender/scons/scons-local/SCons/Script/Main.py
trunk/blender/scons/scons-local/SCons/Script/SConsOptions.py
trunk/blender/scons/scons-local/SCons/Script/SConscript.py
trunk/blender/scons/scons-local/SCons/Script/__init__.py
trunk/blender/scons/scons-local/SCons/Sig.py
trunk/blender/scons/scons-local/SCons/Subst.py
trunk/blender/scons/scons-local/SCons/Taskmaster.py
trunk/blender/scons/scons-local/SCons/Tool/
trunk/blender/scons/scons-local/SCons/Tool/386asm.py
trunk/blender/scons/scons-local/SCons/Tool/BitKeeper.py
trunk/blender/scons/scons-local/SCons/Tool/CVS.py
trunk/blender/scons/scons-local/SCons/Tool/FortranCommon.py
trunk/blender/scons/scons-local/SCons/Tool/GettextCommon.py
trunk/blender/scons/scons-local/SCons/Tool/JavaCommon.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/__init__.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/arch.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/common.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/netframework.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/sdk.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/vc.py
trunk/blender/scons/scons-local/SCons/Tool/MSCommon/vs.py
trunk/blender/scons/scons-local/SCons/Tool/Perforce.py
trunk/blender/scons/scons-local/SCons/Tool/PharLapCommon.py
trunk/blender/scons/scons-local/SCons/Tool/RCS.py
trunk/blender/scons/scons-local/SCons/Tool/SCCS.py
trunk/blender/scons/scons-local/SCons/Tool/Subversion.py
trunk/blender/scons/scons-local/SCon

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55657] trunk/lib/win64/opencollada: Updated OpenCOLLADA libraries for Windows 64bit.

[Nathan Letwory]

Revision: 55657
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55657
Author:   jesterking
Date: 2013-03-29 00:36:46 + (Fri, 29 Mar 2013)
Log Message:
---
Updated OpenCOLLADA libraries for Windows 64bit.

Built from 50403f4f49e15f2625d7c38552841fdadf086ac9

Added Paths:
---
trunk/lib/win64/opencollada/include/opencollada/
trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/
trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABU.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUException.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUHashFunctions.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUIDList.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUNativeString.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPcreCompiledPattern.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPrerequisites.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStableHeaders.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUStringUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUURI.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix3.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathMatrix4.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathPrerequisites.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathQuaternion.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathUtils.h

trunk/lib/win64/opencollada/include/opencollada/COLLADABaseUtils/Math/COLLADABUMathVector3.h
trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/
trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFW.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatable.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimatableFloat.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimation.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationCurve.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnimationList.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAnnotate.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArray.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWArrayPrimitiveType.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWAxisInfo.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWCamera.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWCode.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColor.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWColorOrTexture.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWConstants.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWController.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEdge.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEffect.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEffectCommon.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWException.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFileInfo.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrDoubleArray.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFloatOrParam.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormula.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulaNewParam.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFormulas.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWGeometry.h

trunk/lib/win64/opencollada/include/opencollada/COLLADAFramework/COLLADAFWHashFunctions.h

trunk/lib/win64/opencollada/include/opencoll

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54852] trunk/blender/source/gameengine/ Rasterizer/SConscript: Check if the variable is a string and split nicely, so compile command stays intact wi

[Nathan Letwory]

Revision: 54852
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54852
Author:   jesterking
Date: 2013-02-25 12:03:55 + (Mon, 25 Feb 2013)
Log Message:
---
Check if the variable is a string and split nicely, so compile command stays 
intact with proper include options.

Modified Paths:
--
trunk/blender/source/gameengine/Rasterizer/SConscript

Modified: trunk/blender/source/gameengine/Rasterizer/SConscript
===
--- trunk/blender/source/gameengine/Rasterizer/SConscript   2013-02-25 
12:03:26 UTC (rev 54851)
+++ trunk/blender/source/gameengine/Rasterizer/SConscript   2013-02-25 
12:03:55 UTC (rev 54852)
@@ -47,7 +47,10 @@
 defs = ['GLEW_STATIC']
 
 if env['WITH_BF_PYTHON']:
-incs.append(env['BF_PYTHON_INC'])
+if type(env['BF_PYTHON_INC']) == str:
+  incs.append(env['BF_PYTHON_INC'].split(' '))
+else:
+  incs.append(env['BF_PYTHON_INC'])
 defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50062] branches/pyapi_devel_26/release/ scripts/startup/bl_ui/space_userpref.py: Fix indentation error

[Nathan Letwory]

Revision: 50062
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50062
Author:   jesterking
Date: 2012-08-20 21:20:38 + (Mon, 20 Aug 2012)
Log Message:
---
Fix indentation error

Modified Paths:
--
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py

Modified: 
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py
===
--- branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py 
2012-08-20 21:17:40 UTC (rev 50061)
+++ branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py 
2012-08-20 21:20:38 UTC (rev 50062)
@@ -867,7 +867,7 @@
 layout.separator()
 layout.label(text="Orbit options")
 layout.prop(input_prefs, "ndof_turntable")
-layout.prop(input_prefs, "ndof_roll_invert_axis")
+layout.prop(input_prefs, "ndof_roll_invert_axis")
 layout.prop(input_prefs, "ndof_tilt_invert_axis")
 layout.prop(input_prefs, "ndof_rotate_invert_axis")
 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50061] branches/pyapi_devel_26: Merge from trunk: r49912-50060

[Nathan Letwory]

Revision: 50061
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50061
Author:   jesterking
Date: 2012-08-20 21:17:40 + (Mon, 20 Aug 2012)
Log Message:
---
Merge from trunk: r49912-50060

Revision Links:
--

http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49912

Modified Paths:
--
branches/pyapi_devel_26/CMakeLists.txt
branches/pyapi_devel_26/GNUmakefile
branches/pyapi_devel_26/build_files/cmake/config/blender_lite.cmake
branches/pyapi_devel_26/build_files/scons/tools/btools.py
branches/pyapi_devel_26/doc/python_api/rst/info_best_practice.rst
branches/pyapi_devel_26/intern/CMakeLists.txt
branches/pyapi_devel_26/intern/cycles/CMakeLists.txt
branches/pyapi_devel_26/intern/ghost/GHOST_C-api.h
branches/pyapi_devel_26/intern/iksolver/CMakeLists.txt
branches/pyapi_devel_26/intern/iksolver/SConscript
branches/pyapi_devel_26/release/scripts/modules/bpy/path.py
branches/pyapi_devel_26/release/scripts/modules/console_python.py
branches/pyapi_devel_26/release/scripts/startup/bl_operators/console.py
branches/pyapi_devel_26/release/scripts/startup/bl_operators/node.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_animviz.py

branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_data_curve.py

branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_data_lamp.py

branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_mask_common.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_particle.py

branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_physics_field.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_console.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_image.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_sequencer.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py
branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_view3d.py

branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/pyapi_devel_26/source/blender/blenfont/intern/blf_font.c
branches/pyapi_devel_26/source/blender/blenfont/intern/blf_glyph.c
branches/pyapi_devel_26/source/blender/blenkernel/BKE_colortools.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_fcurve.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_mask.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_mball.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_node.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_object.h
branches/pyapi_devel_26/source/blender/blenkernel/BKE_sequencer.h
branches/pyapi_devel_26/source/blender/blenkernel/CMakeLists.txt
branches/pyapi_devel_26/source/blender/blenkernel/intern/CCGSubSurf.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/CCGSubSurf.h
branches/pyapi_devel_26/source/blender/blenkernel/intern/anim.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/colortools.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/constraint.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/customdata.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/depsgraph.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/fcurve.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/group.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/image.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/ipo.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/key.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/mask.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/mask_rasterize.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/mball.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/mesh.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/node.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/object.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/scene.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/seqcache.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/seqeffects.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/sequencer.c
branches/pyapi_devel_26/source/blender/blenkernel/intern/subsurf_ccg.c
branches/pyapi_devel_26/source/blender/blenlib/BLI_listbase.h
branches/pyapi_devel_26/source/blender/blenlib/BLI_rect.h
branches/pyapi_devel_26/source/blender/blenlib/intern/listbase.c
branches/pyapi_devel_26/source/blender/blenlib/intern/rct.c
branches/pyapi_devel_26/source/blender/blenlib/intern/voronoi.c
branches/pyapi_devel_26/source/blender/blenloader/intern/readfile.c
branches/pyapi_devel_26/source/blender/blenloader/intern/writefile.c
branc

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50060] branches/pyapi_devel_26/source/ blender: * Fix draw function not being set correctly due to wrong have_function check

[Nathan Letwory]

Revision: 50060
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50060
Author:   jesterking
Date: 2012-08-20 20:48:19 + (Mon, 20 Aug 2012)
Log Message:
---
* Fix draw function not being set correctly due to wrong have_function check
* Initialize and draw panels. Note that this is current hackish, as now both
  panels and view content can be drawn.

Modified Paths:
--
branches/pyapi_devel_26/source/blender/editors/space_script/space_script.c
branches/pyapi_devel_26/source/blender/makesrna/intern/rna_space.c

Modified: 
branches/pyapi_devel_26/source/blender/editors/space_script/space_script.c
===
--- branches/pyapi_devel_26/source/blender/editors/space_script/space_script.c  
2012-08-20 20:13:37 UTC (rev 50059)
+++ branches/pyapi_devel_26/source/blender/editors/space_script/space_script.c  
2012-08-20 20:48:19 UTC (rev 50060)
@@ -133,6 +133,8 @@
wmKeyMap *keymap;

UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, 
ar->winy);
+
+   ED_region_panels_init(wm, ar);

/* own keymap */
keymap = WM_keymap_find(wm->defaultconf, "Script", SPACE_SCRIPT, 0);
@@ -150,6 +152,12 @@
glClear(GL_COLOR_BUFFER_BIT);

UI_view2d_view_ortho(v2d);
+
+   /* figure out how to setup region for panels,
+* and how for other drawing. Better not to
+* allow both to not have clashing drawings.
+*/
+   ED_region_panels(C, ar, 1, NULL, -1);

/* data... */
// BPY_script_exec(C, "/root/blender-svn/blender25/test.py", NULL);
@@ -158,9 +166,11 @@
if (sscript->idname[0] || 1) {
SpaceTypeDynamic *std = WM_spacetypedynamic_find("TEST", 
FALSE); /* sscript->idname */
if (std) {
-   SpaceDynamic sd = {0}; /* PYSPACE_TODO, make 
persistant? - Campbell */
-   sd.type = std;
-   std->draw(C, ar, sscript, &sd);
+   if(std->draw) {
+   SpaceDynamic sd = {0}; /* PYSPACE_TODO, make 
persistant? - Campbell */
+   sd.type = std;
+   std->draw(C, ar, sscript, &sd);
+   }
}
// BPY_run_script_space_draw(C, sscript);
}

Modified: branches/pyapi_devel_26/source/blender/makesrna/intern/rna_space.c
===
--- branches/pyapi_devel_26/source/blender/makesrna/intern/rna_space.c  
2012-08-20 20:13:37 UTC (rev 50059)
+++ branches/pyapi_devel_26/source/blender/makesrna/intern/rna_space.c  
2012-08-20 20:48:19 UTC (rev 50060)
@@ -75,6 +75,7 @@
{SPACE_CONSOLE, "CONSOLE", 0, "Python Console", ""},
{SPACE_USERPREF, "USER_PREFERENCES", 0, "User Preferences", ""},
{SPACE_CLIP, "CLIP_EDITOR", 0, "Clip Editor", ""},
+   {SPACE_SCRIPT, "TEST", 0, "Test", ""},
 /* PYSPACE_TODO - make dynamic enum */
{0, NULL, 0, NULL, NULL}
 };
@@ -252,7 +253,7 @@
RNA_def_struct_flag(std->ext.srna, STRUCT_NO_IDPROPERTIES);
 
//std->poll = (have_function[0]) ? space_poll : NULL;
-   std->draw = (have_function[1]) ? space_draw : NULL;
+   std->draw = (have_function[0]) ? space_draw : NULL;
 
WM_spacetypedynamic_add(std);
 
@@ -1274,7 +1275,7 @@
/* draw */
func = RNA_def_function(srna, "draw", NULL);
RNA_def_function_ui_description(func, "Draw function for the operator");
-   //RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
+   //RNA_def_function_flag(func, FUNC_REGISTER);
parm = RNA_def_pointer(func, "context", "Context", "", "");
RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
parm = RNA_def_pointer(func, "region", "Region", "", "");

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47200] trunk/blender/source/blender/ editors/space_api: Remove useless file

[Nathan Letwory]

Revision: 47200
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47200
Author:   jesterking
Date: 2012-05-30 04:17:21 + (Wed, 30 May 2012)
Log Message:
---
Remove useless file

Modified Paths:
--
trunk/blender/source/blender/editors/space_api/CMakeLists.txt

Removed Paths:
-
trunk/blender/source/blender/editors/space_api/space.c

Modified: trunk/blender/source/blender/editors/space_api/CMakeLists.txt
===
--- trunk/blender/source/blender/editors/space_api/CMakeLists.txt   
2012-05-30 02:54:39 UTC (rev 47199)
+++ trunk/blender/source/blender/editors/space_api/CMakeLists.txt   
2012-05-30 04:17:21 UTC (rev 47200)
@@ -35,7 +35,6 @@
 )
 
 set(SRC
-   space.c
spacetypes.c
 )
 

Deleted: trunk/blender/source/blender/editors/space_api/space.c
===
--- trunk/blender/source/blender/editors/space_api/space.c  2012-05-30 
02:54:39 UTC (rev 47199)
+++ trunk/blender/source/blender/editors/space_api/space.c  2012-05-30 
04:17:21 UTC (rev 47200)
@@ -1,44 +0,0 @@
-/*
- * * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2007 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * * END GPL LICENSE BLOCK *
- */
-
-/** \file blender/editors/space_api/space.c
- *  \ingroup spapi
- */
-
-
-#include 
-#include 
-
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-
-
-/* */
-
-
-

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46690] trunk/lib/mingw64/opencollada: The first build was apparently incorrect.

[Nathan Letwory]

Revision: 46690
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46690
Author:   jesterking
Date: 2012-05-16 10:25:03 + (Wed, 16 May 2012)
Log Message:
---
The first build was apparently incorrect. A small fix and updated libs now have 
mingw64 builds working correctly on export.

Thanks to Gaia-Clary for assisting in the bughunt and fix.

Modified Paths:
--
trunk/lib/mingw64/opencollada/lib/libGeneratedSaxParser.a
trunk/lib/mingw64/opencollada/lib/libMathMLSolver.a
trunk/lib/mingw64/opencollada/lib/libOpenCOLLADABaseUtils.a
trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAFramework.a
trunk/lib/mingw64/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAStreamWriter.a
trunk/lib/mingw64/opencollada/lib/libUTF.a
trunk/lib/mingw64/opencollada/lib/libbuffer.a
trunk/lib/mingw64/opencollada/lib/libftoa.a
trunk/lib/mingw64/opencollada/lib/libpcre.a
trunk/lib/mingw64/opencollada/lib/libxml.a
trunk/lib/mingw64/opencollada/r869_mingw64_building.patch

Modified: trunk/lib/mingw64/opencollada/lib/libGeneratedSaxParser.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libMathMLSolver.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADABaseUtils.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAFramework.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libOpenCOLLADAStreamWriter.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libUTF.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libbuffer.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libftoa.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libpcre.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/lib/libxml.a
===
(Binary files differ)

Modified: trunk/lib/mingw64/opencollada/r869_mingw64_building.patch
===
--- trunk/lib/mingw64/opencollada/r869_mingw64_building.patch   2012-05-16 
10:10:42 UTC (rev 46689)
+++ trunk/lib/mingw64/opencollada/r869_mingw64_building.patch   2012-05-16 
10:25:03 UTC (rev 46690)
@@ -35,6 +35,15 @@
  #else
  # include 
  #endif
+@@ -25,7 +29,7 @@
+ #   include   /* FILE */
+ #endif
+ 
+-#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (__STDC_VERSION__ >= 
199901L)
++#if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__MINGW32__)) 
|| (__STDC_VERSION__ >= 199901L)
+ typedef int64_t __int64;
+ #endif
+ 
 Index: common/libBuffer/src/CommonFWriteBufferFlusher.cpp
 ===
 --- common/libBuffer/src/CommonFWriteBufferFlusher.cpp (revision 869)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46590] trunk/blender/build_files/scons/ config/win32-vc-config.py: Disable sm_13 CUDA kernel building for now, as the build fails with out of memory.

[Nathan Letwory]

Revision: 46590
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46590
Author:   jesterking
Date: 2012-05-12 22:00:32 + (Sat, 12 May 2012)
Log Message:
---
Disable sm_13 CUDA kernel building for now, as the build fails with out of 
memory.

Modified Paths:
--
trunk/blender/build_files/scons/config/win32-vc-config.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===
--- trunk/blender/build_files/scons/config/win32-vc-config.py   2012-05-12 
21:38:35 UTC (rev 46589)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py   2012-05-12 
22:00:32 UTC (rev 46590)
@@ -165,7 +165,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until 
the compile can fit in 32bit process again :)
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46588] trunk/blender/build_files/scons/ tools/btools.py: Enable setting of CUDA kernels to compile on command-line:

[Nathan Letwory]

Revision: 46588
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46588
Author:   jesterking
Date: 2012-05-12 21:37:01 + (Sat, 12 May 2012)
Log Message:
---
Enable setting of CUDA kernels to compile on command-line:

python scons/scons.py BF_CYCLES_CUDA_BINARIES_ARCH=sm_20,sm21

Modified Paths:
--
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2012-05-12 21:29:25 UTC 
(rev 46587)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-05-12 21:37:01 UTC 
(rev 46588)
@@ -177,6 +177,7 @@
 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
 'C_WARN', 'CC_WARN', 'CXX_WARN',
 'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 
'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
+'BF_CYCLES_CUDA_BINARIES_ARCH',
 ]
 
 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46556] trunk/blender/build_files/scons/ config/win64-mingw-config.py: Enable OpenCOLLADA support for MingW64 builds by default.

[Nathan Letwory]

Revision: 46556
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46556
Author:   jesterking
Date: 2012-05-11 17:29:55 + (Fri, 11 May 2012)
Log Message:
---
Enable OpenCOLLADA support for MingW64 builds by default.

Note: don't forget to update your local checkout of lib/mingw64

Modified Paths:
--
trunk/blender/build_files/scons/config/win64-mingw-config.py

Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===
--- trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-11 17:25:19 UTC (rev 46555)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-11 17:29:55 UTC (rev 46556)
@@ -137,14 +137,14 @@
  '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
  '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 
-WITH_BF_COLLADA = False # TODO: Compile Collada with MinGW-w64
+WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader 
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver 
expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader 
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver 
pcre buffer ftoa xml'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Cycles

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46555] trunk/lib/mingw64: Add OpenCOLLADA libraries compiled with MingW64.

[Nathan Letwory]

Revision: 46555
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46555
Author:   jesterking
Date: 2012-05-11 17:25:19 + (Fri, 11 May 2012)
Log Message:
---
Add OpenCOLLADA libraries compiled with MingW64.

Patch against OpenCOLLADA r869 is included. Configuration changes for at least 
SCons I'll make to trunk soon too.

Revision Links:
--

http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=869

Added Paths:
---
trunk/lib/mingw64/opencollada/
trunk/lib/mingw64/opencollada/include/
trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/
trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/
trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABU.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUException.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUIDList.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUNativeString.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/COLLADABUhash_map.h
trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix3.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathPrerequisites.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathQuaternion.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h

trunk/lib/mingw64/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h
trunk/lib/mingw64/opencollada/include/COLLADAFramework/
trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/
trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFW.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnimatable.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnimatableFloat.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationCurve.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationList.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAnnotate.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWAxisInfo.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWCode.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWColor.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWConstants.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWController.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWEffect.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWEffectCommon.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWException.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrDoubleArray.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFormula.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFormulaNewParam.h

trunk/lib/mingw64/opencollada/include/COLLADAFramework/include/COLLADAFWFormulas.h

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46487] tags/blender-2.63a-release/blender : Merge 46051-46053 to ensure compilation on Windows

[Nathan Letwory]

Revision: 46487
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46487
Author:   jesterking
Date: 2012-05-10 09:05:03 + (Thu, 10 May 2012)
Log Message:
---
Merge 46051-46053 to ensure compilation on Windows

Modified Paths:
--

tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt

tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript

tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt
tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript
tags/blender-2.63a-release/blender/source/gameengine/Ketsji/CMakeLists.txt
tags/blender-2.63a-release/blender/source/gameengine/Ketsji/SConscript

Property Changed:

tags/blender-2.63a-release/blender/


Property changes on: tags/blender-2.63a-release/blender
___
Modified: svn:mergeinfo
   - 
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417,46423-46424,46439,46445,46449-46450,46453-46454
   + 
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:46003-46005,46014-46016,46027-46028,46035-46036,46039,46043,46051-46053,46072,46077,46085,46091,46093,46095,46116-46117,46120,46125,46127,46131,46136,46138,46140-46143,46148-46149,46152,46156-46160,46172,46178-46181,46183-46184,46192,46194,46196-46197,46205-46206,46213-46215,46222,46224-46236,46241,46246,46250,46253,46260-46261,46264-46265,46269,46273,46277-46278,46280,46282,46289-46290,46294,46305,46308,46310-46311,46316,46327,46336,46338,46341-46342,46345-46347,46354,46361-46363,46385,46391,46393,46410-46412,46416-46417,46423-46424,46439,46445,46449-46450,46453-46454

Modified: 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===
--- 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
 2012-05-10 07:10:39 UTC (rev 46486)
+++ 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
 2012-05-10 09:05:03 UTC (rev 46487)
@@ -32,7 +32,7 @@
 )
 
 set(INC_SYS
-
+   ${PTHREADS_INCLUDE_DIRS}
 )
 
 set(SRC

Modified: 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript
===
--- 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript 
2012-05-10 07:10:39 UTC (rev 46486)
+++ 
tags/blender-2.63a-release/blender/source/gameengine/BlenderRoutines/SConscript 
2012-05-10 09:05:03 UTC (rev 46487)
@@ -35,4 +35,7 @@
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 
'win64-mingw'):
+incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, 
libtype=['core','player'], priority=[300,35] , 
cxx_compileflags=env['BGE_CXXFLAGS'])

Modified: 
tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt
===
--- 
tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt   
2012-05-10 07:10:39 UTC (rev 46486)
+++ 
tags/blender-2.63a-release/blender/source/gameengine/Converter/CMakeLists.txt   
2012-05-10 09:05:03 UTC (rev 46487)
@@ -59,6 +59,7 @@
 )
 
 set(INC_SYS
+   ${PTHREADS_INCLUDE_DIRS}
 
 )
 

Modified: 
tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript
===
--- tags/blender-2.63a-release/blender/source/gameengine/Converter/SConscript   
2012-05-

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46482] trunk/blender/source/blender/ collada/MaterialExporter.cpp: Apply [#30199] Fix COLLADA export of material names

[Nathan Letwory]

Revision: 46482
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46482
Author:   jesterking
Date: 2012-05-09 22:54:18 + (Wed, 09 May 2012)
Log Message:
---
Apply [#30199] Fix COLLADA export of material names
Submitted by Daniel Balster

Modified Paths:
--
trunk/blender/source/blender/collada/MaterialExporter.cpp

Modified: trunk/blender/source/blender/collada/MaterialExporter.cpp
===
--- trunk/blender/source/blender/collada/MaterialExporter.cpp   2012-05-09 
20:47:13 UTC (rev 46481)
+++ trunk/blender/source/blender/collada/MaterialExporter.cpp   2012-05-09 
22:54:18 UTC (rev 46482)
@@ -70,7 +70,7 @@
 {
std::string name(id_name(ma));
 
-   openMaterial(get_material_id(ma), name);
+   openMaterial(get_material_id(ma), get_material_id(ma));
 
std::string efid = translate_id(name) + "-effect";
addInstanceEffect(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, efid));

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46449] trunk/blender/source/blender/ collada: Apply [#31335] COLLADA: fix for odd names for materials in exported dae files

[Nathan Letwory]

Revision: 46449
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46449
Author:   jesterking
Date: 2012-05-09 08:14:49 + (Wed, 09 May 2012)
Log Message:
---
Apply [#31335] COLLADA: fix for odd names for materials in exported dae files
Patch by Gaia Clary

This patch removes the index numbering from materials, which is not necessary.

Modified Paths:
--
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/InstanceWriter.cpp

Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===
--- trunk/blender/source/blender/collada/GeometryExporter.cpp   2012-05-09 
08:09:03 UTC (rev 46448)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp   2012-05-09 
08:14:49 UTC (rev 46449)
@@ -209,7 +209,7 @@
// sets material name
if (ma) {
std::ostringstream ostr;
-   ostr << translate_id(id_name(ma)) << material_index+1;
+   ostr << translate_id(id_name(ma));
polylist.setMaterial(ostr.str());
}


Modified: trunk/blender/source/blender/collada/InstanceWriter.cpp
===
--- trunk/blender/source/blender/collada/InstanceWriter.cpp 2012-05-09 
08:09:03 UTC (rev 46448)
+++ trunk/blender/source/blender/collada/InstanceWriter.cpp 2012-05-09 
08:14:49 UTC (rev 46449)
@@ -52,7 +52,7 @@
std::string matid(get_material_id(ma));
matid = translate_id(matid);
std::ostringstream ostr;
-   ostr << translate_id(id_name(ma)) << a+1;
+   ostr << translate_id(id_name(ma));
COLLADASW::InstanceMaterial im(ostr.str(), 
COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid));

// create  for each uv map

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46133] trunk/blender/source/blender/ collada: Apply patch [#31179] COLLADA IMPORT instanced geometry improvement

[Nathan Letwory]

Revision: 46133
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46133
Author:   jesterking
Date: 2012-04-30 23:51:09 + (Mon, 30 Apr 2012)
Log Message:
---
Apply patch [#31179] COLLADA IMPORT instanced geometry improvement
from Martijn Berger

This patch improves importing instanced geometry consisting of multiple nodes.

Modified Paths:
--
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.h
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.h

Modified: trunk/blender/source/blender/collada/AnimationImporter.cpp
===
--- trunk/blender/source/blender/collada/AnimationImporter.cpp  2012-04-30 
23:19:56 UTC (rev 46132)
+++ trunk/blender/source/blender/collada/AnimationImporter.cpp  2012-04-30 
23:51:09 UTC (rev 46133)
@@ -779,15 +779,15 @@
 }
 
 void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
-   
   std::map& root_map,
-   
   std::map& object_map,
-   
   std::map 
FW_object_map)
+   
std::map& root_map,
+   
std::multimap& object_map,
+   
std::map 
FW_object_map)
 {
AnimationImporter::AnimMix* animType = get_animation_type(node, 
FW_object_map );
 
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
COLLADAFW::Node *root = root_map.find(node->getUniqueId()) == 
root_map.end() ? node : root_map[node->getUniqueId()];
-   Object *ob = is_joint ? armature_importer->get_armature_for_joint(root) 
: object_map[node->getUniqueId()];
+Object *ob = is_joint ? armature_importer->get_armature_for_joint(root) : 
object_map.find(node->getUniqueId())->second;
if (!ob) {
fprintf(stderr, "cannot find Object for Node with id=\"%s\"\n", 
node->getOriginalId().c_str());
return;

Modified: trunk/blender/source/blender/collada/AnimationImporter.h
===
--- trunk/blender/source/blender/collada/AnimationImporter.h2012-04-30 
23:19:56 UTC (rev 46132)
+++ trunk/blender/source/blender/collada/AnimationImporter.h2012-04-30 
23:51:09 UTC (rev 46133)
@@ -143,10 +143,10 @@
virtual void change_eul_to_quat(Object *ob, bAction *act);
 #endif
 
-   void translate_Animations(COLLADAFW::Node * Node,
- std::map& root_map,
- std::map& 
object_map,
- std::map FW_object_map);
+   void translate_Animations(COLLADAFW::Node * Node , 
+ 
std::map& root_map,
+ 
std::multimap& object_map ,
+ 
std::map FW_object_map);
 
AnimMix* get_animation_type( const COLLADAFW::Node * node, 
std::map FW_object_map );
 

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===
--- trunk/blender/source/blender/collada/DocumentImporter.cpp   2012-04-30 
23:19:56 UTC (rev 46132)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp   2012-04-30 
23:51:09 UTC (rev 46133)
@@ -371,10 +371,11 @@
Object *new_child = NULL;
if (inodes.getCount()) { // \todo loop through instance 
nodes
const COLLADAFW::UniqueId& id = 
inodes[0]->getInstanciatedObjectId();
-   new_child = 
create_instance_node(object_map[id], node_map[id], child_node, sce, 
is_library_node);
+   fprintf(stderr,"Doing %d child nodes\n" 
,node_map.count(id));
+   new_child = 
create_instance_node(object_map.find(id)->second, node_map[id], child_node, 
sce, is_library_node);
}
else {
-   new_child = 
create_instance_node(object_map[child_id], child_node, NULL, sce, 
is_library_node);
+   new_child = 
create_instance_node(object_map.find(child_id)->second, child_node, NULL, sce, 
is_library_node);
}
bc_set_parent(new_child, obn, mContext, true);
 
@@ -392,13 +3

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46057] trunk/blender/source/gameengine/ Ketsji/KX_KetsjiEngine.cpp: compile fixes:

[Nathan Letwory]

Revision: 46057
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46057
Author:   jesterking
Date: 2012-04-29 00:44:49 + (Sun, 29 Apr 2012)
Log Message:
---
compile fixes:

* near and far var names confused mingw64, renamed
* mingw defines a macro named DrawText, confusing the DrawText function usage 
from KX_FontObject.

Modified Paths:
--
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp  2012-04-29 
00:33:24 UTC (rev 46056)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp  2012-04-29 
00:44:49 UTC (rev 46057)
@@ -52,12 +52,9 @@
 #include "RAS_IRasterizer.h"
 #include "RAS_IRenderTools.h"
 #include "RAS_ICanvas.h"
-#include "STR_String.h"
 #include "MT_Vector3.h"
 #include "MT_Transform.h"
 #include "SCA_IInputDevice.h"
-#include "KX_Scene.h"
-#include "MT_CmMatrix4x4.h"
 #include "KX_Camera.h"
 #include "KX_FontObject.h"
 #include "KX_Dome.h"
@@ -90,6 +87,12 @@
 #define DEFAULT_LOGIC_TIC_RATE 60.0
 #define DEFAULT_PHYSICS_TIC_RATE 60.0
 
+#ifdef FREE_WINDOWS /* XXX mingw64 (gcc 4.7.0) defines a macro for DrawText 
that translates to DrawTextA. Not good */
+#ifdef DrawText
+#undef DrawText
+#endif
+#endif
+
 const char KX_KetsjiEngine::m_profileLabels[tc_numCategories][15] = {
"Physics:", // tc_physics
"Logic:",   // tc_logic
@@ -1063,37 +1066,30 @@
m_overrideSceneName = forscene;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraZoom(float camzoom)
 {
m_cameraZoom = camzoom;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraOverrideUseOrtho(bool useOrtho)
 {
m_overrideCamUseOrtho = useOrtho;
 }
 
-
-
 void KX_KetsjiEngine::SetCameraOverrideProjectionMatrix(const MT_CmMatrix4x4& 
mat)
 {
m_overrideCamProjMat = mat;
 }
 
-
 void KX_KetsjiEngine::SetCameraOverrideViewMatrix(const MT_CmMatrix4x4& mat)
 {
m_overrideCamViewMat = mat;
 }
 
-void KX_KetsjiEngine::SetCameraOverrideClipping(float near, float far)
+void KX_KetsjiEngine::SetCameraOverrideClipping(float nearfrust, float 
farfrust)
 {
-   m_overrideCamNear = near;
-   m_overrideCamFar = far;
+   m_overrideCamNear = nearfrust;
+   m_overrideCamFar = farfrust;
 }
 
 void KX_KetsjiEngine::SetCameraOverrideLens(float lens)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46052] trunk/blender/source/gameengine/ BlenderRoutines/SConscript: fix pthread path for windows builds

[Nathan Letwory]

Revision: 46052
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46052
Author:   jesterking
Date: 2012-04-28 23:15:34 + (Sat, 28 Apr 2012)
Log Message:
---
fix pthread path for windows builds

Modified Paths:
--
trunk/blender/source/gameengine/BlenderRoutines/SConscript

Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript  2012-04-28 
22:59:55 UTC (rev 46051)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript  2012-04-28 
23:15:34 UTC (rev 46052)
@@ -35,4 +35,7 @@
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 
'win64-mingw'):
+incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, 
libtype=['core','player'], priority=[300,35] , 
cxx_compileflags=env['BGE_CXXFLAGS'])

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46022] trunk/blender/build_files/scons/ tools/btools.py: bump commit count, mingw32 -> mingw64

[Nathan Letwory]

Revision: 46022
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46022
Author:   jesterking
Date: 2012-04-28 08:47:37 + (Sat, 28 Apr 2012)
Log Message:
---
bump commit count, mingw32 -> mingw64

Modified Paths:
--
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2012-04-28 08:45:55 UTC 
(rev 46021)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-04-28 08:47:37 UTC 
(rev 46022)
@@ -624,7 +624,7 @@
 
 if env['OURPLATFORM'] == 'win32-mingw':
 platform = 'mingw32'
-elif env['OURPLATFORM'] == 'win32-mingw':
+elif env['OURPLATFORM'] == 'win64-mingw':
 platform = 'mingw64'
 else:
 platform = env['OURPLATFORM'].split('-')[0]

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46021] trunk/blender/build_files: Add MingW as "platform"

[Nathan Letwory]

Revision: 46021
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46021
Author:   jesterking
Date: 2012-04-28 08:45:55 + (Sat, 28 Apr 2012)
Log Message:
---
Add MingW as "platform"

Modified Paths:
--
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/buildbot/master_unpack.py
===
--- trunk/blender/build_files/buildbot/master_unpack.py 2012-04-28 08:43:24 UTC 
(rev 46020)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2012-04-28 08:45:55 UTC 
(rev 46021)
@@ -48,7 +48,8 @@
 tokens = filename.split("-")
 platforms = ('osx', 'mac', 'bsd',
  'win', 'linux', 'source',
- 'solaris')
+ 'solaris',
+ 'mingw')
 platform_tokens = []
 found = False
 

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2012-04-28 08:43:24 UTC 
(rev 46020)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-04-28 08:45:55 UTC 
(rev 46021)
@@ -622,7 +622,13 @@
 else:
 extension = '.tar.bz2'
 
-platform = env['OURPLATFORM'].split('-')[0]
+if env['OURPLATFORM'] == 'win32-mingw':
+platform = 'mingw32'
+elif env['OURPLATFORM'] == 'win32-mingw':
+platform = 'mingw64'
+else:
+platform = env['OURPLATFORM'].split('-')[0]
+
 if platform == 'linux':
 import platform
 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46009] trunk/blender/build_files/buildbot /slave_pack.py: Same mingw fix as for compile

[Nathan Letwory]

Revision: 46009
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46009
Author:   jesterking
Date: 2012-04-28 06:28:07 + (Sat, 28 Apr 2012)
Log Message:
---
Same mingw fix as for compile

Modified Paths:
--
trunk/blender/build_files/buildbot/slave_pack.py

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===
--- trunk/blender/build_files/buildbot/slave_pack.py2012-04-28 01:59:21 UTC 
(rev 46008)
+++ trunk/blender/build_files/buildbot/slave_pack.py2012-04-28 06:28:07 UTC 
(rev 46009)
@@ -81,6 +81,8 @@
 scons_options.append('BF_BITNESS=' + bitness)
 scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
 scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+if builder.find('mingw') != -1:
+scons_options.append('BF_TOOLSET=mingw')
 
 retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
 sys.exit(retcode)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46006] trunk/blender/build_files/buildbot : Changes to get mingw buildslaves going.

[Nathan Letwory]

Revision: 46006
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46006
Author:   jesterking
Date: 2012-04-27 13:18:55 + (Fri, 27 Apr 2012)
Log Message:
---
Changes to get mingw buildslaves going.

Modified Paths:
--
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/master.cfg
===
--- trunk/blender/build_files/buildbot/master.cfg   2012-04-27 12:44:32 UTC 
(rev 46005)
+++ trunk/blender/build_files/buildbot/master.cfg   2012-04-27 13:18:55 UTC 
(rev 46006)
@@ -117,6 +117,8 @@
 add_builder(c, 'win32_scons', 'windows', generic_builder)
 add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 
'soc-2011-salad')
 add_builder(c, 'win64_scons', 'win64', generic_builder)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
+add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
 #add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
 #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===
--- trunk/blender/build_files/buildbot/slave_compile.py 2012-04-27 12:44:32 UTC 
(rev 46005)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2012-04-27 13:18:55 UTC 
(rev 46006)
@@ -117,6 +117,8 @@
 scons_options.append('BF_BITNESS=' + bitness)
 scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
 scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+if builder.find('mingw') != -1:
+scons_options.append('BF_TOOLSET=mingw')
 
 retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
 sys.exit(retcode)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45975] trunk/blender/SConstruct: Fix OIIO dll copying for win32-mingw

[Nathan Letwory]

Revision: 45975
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45975
Author:   jesterking
Date: 2012-04-26 08:04:11 + (Thu, 26 Apr 2012)
Log Message:
---
Fix OIIO dll copying for win32-mingw

Modified Paths:
--
trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2012-04-26 05:17:54 UTC (rev 45974)
+++ trunk/blender/SConstruct2012-04-26 08:04:11 UTC (rev 45975)
@@ -774,7 +774,7 @@
 dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll') 
 dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
-if env['WITH_BF_OIIO']:
+if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
 dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
 
 dllsources.append('#source/icons/blender.exe.manifest')

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45368] trunk/blender/source/blender/imbuf /intern/openexr/openexr_api.cpp: Make sure Multilayer EXR from other apps are read in as multilayer.

[Nathan Letwory]

Revision: 45368
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45368
Author:   jesterking
Date: 2012-04-03 11:53:38 + (Tue, 03 Apr 2012)
Log Message:
---
Make sure Multilayer EXR from other apps are read in as multilayer.

Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp   
2012-04-03 11:19:58 UTC (rev 45367)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp   
2012-04-03 11:53:38 UTC (rev 45368)
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 #include 
@@ -945,12 +946,17 @@
return !(file->header().channels().findChannel("Z") == NULL);
 }
 
-static int exr_is_renderresult(InputFile *file)
+static int exr_is_multilayer(InputFile *file)
 {
const StringAttribute *comments= 
file->header().findTypedAttribute("BlenderMultiChannel");
-   if (comments)
-// if (comments->value() == "Blender MultiChannel")
+   const ChannelList &channels = file->header().channels();
+   std::set  layerNames;
+
+   channels.layers(layerNames);
+
+   if (comments || layerNames.size()>1)
return 1;
+
return 0;
 }
 
@@ -977,7 +983,7 @@
if (0) // debug
exr_print_filecontents(file);

-   is_multi= exr_is_renderresult(file);
+   is_multi= exr_is_multilayer(file);

/* do not make an ibuf when */
if (is_multi && !(flags & IB_test) && !(flags & IB_multilayer)) 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45358] trunk/blender/source/blender/imbuf /intern/openexr/SConscript: r45338 added multithreaded OpenEXR loading.

[Nathan Letwory]

Revision: 45358
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45358
Author:   jesterking
Date: 2012-04-03 05:23:23 + (Tue, 03 Apr 2012)
Log Message:
---
r45338 added multithreaded OpenEXR loading. Path to pthread was missing.

Revision Links:
--

http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45338

Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/openexr/SConscript

Modified: trunk/blender/source/blender/imbuf/intern/openexr/SConscript
===
--- trunk/blender/source/blender/imbuf/intern/openexr/SConscript
2012-04-03 03:17:49 UTC (rev 45357)
+++ trunk/blender/source/blender/imbuf/intern/openexr/SConscript
2012-04-03 05:23:23 UTC (rev 45358)
@@ -15,4 +15,7 @@
 
 defs = ['WITH_OPENEXR']
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+incs.append(env['BF_PTHREADS_INC'])
+
 env.BlenderLib ('bf_imbuf_openexr', source_files, incs, defs, 
libtype=['core','player'], priority = [225,180])

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44736] trunk/blender/source/blender/ python/intern/bpy_traceback.c: Add missing include.

[Nathan Letwory]

Revision: 44736
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44736
Author:   jesterking
Date: 2012-03-08 10:52:30 + (Thu, 08 Mar 2012)
Log Message:
---
Add missing include.

Modified Paths:
--
trunk/blender/source/blender/python/intern/bpy_traceback.c

Modified: trunk/blender/source/blender/python/intern/bpy_traceback.c
===
--- trunk/blender/source/blender/python/intern/bpy_traceback.c  2012-03-08 
10:13:31 UTC (rev 44735)
+++ trunk/blender/source/blender/python/intern/bpy_traceback.c  2012-03-08 
10:52:30 UTC (rev 44736)
@@ -30,6 +30,7 @@
 #include 
 
 #include "BLI_path_util.h"
+#include "BLI_string.h"
 
 #include "bpy_traceback.h"
 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43738] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: Fix [#29884] Splash screen only displays "r43"

[Nathan Letwory]

Revision: 43738
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43738
Author:   jesterking
Date: 2012-01-27 07:35:57 + (Fri, 27 Jan 2012)
Log Message:
---
Fix [#29884] Splash screen only displays "r43"
Based on patch by perfection cat

Removed the unnecessary char * juggling.

Revision Links:
--

http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43

Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2012-01-27 01:30:58 UTC (rev 43737)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2012-01-27 07:35:57 UTC (rev 43738)
@@ -1277,22 +1277,17 @@
 
 #ifdef WITH_BUILDINFO
int ver_width, rev_width;
-   char *version_str = NULL;
-   char *revision_str = NULL;
char version_buf[128];
char revision_buf[128];
extern char build_rev[];

-   version_str = &version_buf[0];
-   revision_str = &revision_buf[0];
-   
-   BLI_snprintf(version_str, sizeof(version_str),
+   BLI_snprintf(version_buf, sizeof(version_buf),
 "%d.%02d.%d", BLENDER_VERSION/100, BLENDER_VERSION%100, 
BLENDER_SUBVERSION);
-   BLI_snprintf(revision_str, sizeof(revision_str), "r%s", build_rev);
+   BLI_snprintf(revision_buf, sizeof(revision_buf), "r%s", build_rev);

BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, 
U.dpi);
-   ver_width = (int)BLF_width(style->widgetlabel.uifont_id, version_str) + 
5;
-   rev_width = (int)BLF_width(style->widgetlabel.uifont_id, revision_str) 
+ 5;
+   ver_width = (int)BLF_width(style->widgetlabel.uifont_id, version_buf) + 
5;
+   rev_width = (int)BLF_width(style->widgetlabel.uifont_id, revision_buf) 
+ 5;
 #endif //WITH_BUILDINFO
 
block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
@@ -1303,8 +1298,8 @@
uiBlockSetFunc(block, wm_block_splash_refreshmenu, block, NULL);

 #ifdef WITH_BUILDINFO  
-   uiDefBut(block, LABEL, 0, version_str, 494-ver_width, 282-24, 
ver_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
-   uiDefBut(block, LABEL, 0, revision_str, 494-rev_width, 282-36, 
rev_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+   uiDefBut(block, LABEL, 0, version_buf, 494-ver_width, 282-24, 
ver_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+   uiDefBut(block, LABEL, 0, revision_buf, 494-rev_width, 282-36, 
rev_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 #endif //WITH_BUILDINFO

layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 10, 
2, 480, 110, style);

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41831] trunk/blender: Apply patch [#28632 ] Add individual invert to 3d mouse in turntable mode and when zooming

[Nathan Letwory]

Revision: 41831
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41831
Author:   jesterking
Date: 2011-11-14 14:02:19 + (Mon, 14 Nov 2011)
Log Message:
---
Apply patch [#28632] Add individual invert to 3d mouse in turntable mode and 
when zooming
Submitted by Rainer Wahler

This patch adds the individual invert options for the turntable mode too. In 
turntable mode there are only the rotate and roll and no tilt axis to invert.

Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py   
2011-11-14 12:55:46 UTC (rev 41830)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py   
2011-11-14 14:02:19 UTC (rev 41831)
@@ -765,10 +765,9 @@
 layout.label(text="Orbit options")
 if input_prefs.view_rotate_method == 'TRACKBALL':
 layout.prop(input_prefs, "ndof_roll_invert_axis")
-layout.prop(input_prefs, "ndof_tilt_invert_axis")
-layout.prop(input_prefs, "ndof_rotate_invert_axis")
-else:
-layout.prop(input_prefs, "ndof_orbit_invert_axes")
+layout.prop(input_prefs, "ndof_tilt_invert_axis")
+layout.prop(input_prefs, "ndof_rotate_invert_axis")
+layout.prop(input_prefs, "ndof_zoom_invert")
 
 layout.separator()
 layout.label(text="Pan options")
@@ -776,6 +775,9 @@
 layout.prop(input_prefs, "ndof_pany_invert_axis")
 layout.prop(input_prefs, "ndof_panz_invert_axis")
 
+layout.label(text="Zoom options")
+layout.prop(input_prefs, "ndof_zoom_updown")
+
 layout.separator()
 layout.label(text="Fly options")
 layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 
2011-11-14 12:55:46 UTC (rev 41830)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 
2011-11-14 14:02:19 UTC (rev 41831)
@@ -1031,21 +1031,17 @@
rv3d->view = RV3D_VIEW_USER;

if (U.flag & USER_TRACKBALL) {
-   const int invert_roll = U.ndof_flag & 
NDOF_ROLL_INVERT_AXIS;
-   const int invert_tilt = U.ndof_flag & 
NDOF_TILT_INVERT_AXIS;
-   const int invert_rot = U.ndof_flag & 
NDOF_ROTATE_INVERT_AXIS;
-
float rot[4];
float axis[3];
float angle = rot_sensitivity * 
ndof_to_axis_angle(ndof, axis);
 
-   if (invert_roll)
+   if (U.ndof_flag & NDOF_ROLL_INVERT_AXIS)
axis[2] = -axis[2];
 
-   if (invert_tilt)
+   if (U.ndof_flag & NDOF_TILT_INVERT_AXIS)
axis[0] = -axis[0];
 
-   if (invert_rot)
+   if (U.ndof_flag & 
NDOF_ROTATE_INVERT_AXIS)
axis[1] = -axis[1];
 
// transform rotation axis from view to 
world coordinates
@@ -1061,8 +1057,6 @@
mul_qt_qtqt(rv3d->viewquat, 
rv3d->viewquat, rot);
} else {
/* turntable view code by John Aughey, 
adapted for 3D mouse by [mce] */
-   const int invert = U.ndof_flag & 
NDOF_ORBIT_INVERT_AXES;
-
float angle, rot[4];
float xvec[3] = {1,0,0};

@@ -1071,7 +1065,7 @@

/* Perform the up/down rotation */
angle = rot_sensitivity * dt * 
ndof->rvec[0];
-   if (invert)
+   if (U.ndof_flag & NDOF_TILT_INVERT_AXIS)
angle = -angle;
rot[0] = cos(angle);
   

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41704] trunk/blender/build_files/scons: Fix ${} var usage.

[Nathan Letwory]

Revision: 41704
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41704
Author:   jesterking
Date: 2011-11-09 17:22:55 + (Wed, 09 Nov 2011)
Log Message:
---
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.

Noticed still missing: OSX file copying (cycles .py files, kernel files, 
licenses).

Modified Paths:
--
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===
--- trunk/blender/build_files/scons/config/win32-vc-config.py   2011-11-09 
17:18:37 UTC (rev 41703)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py   2011-11-09 
17:22:55 UTC (rev 41704)
@@ -153,16 +153,16 @@
 WITH_BF_CYCLES = True 
 
 WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '#../lib/windows/openimageio/include'
+BF_OIIO = '${LIBDIR}/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
 BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '#../lib/windows/openimageio/lib'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 
 WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '#../lib/windows/boost/include'
+BF_BOOST = '${LIBDIR}/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
 BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 
libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 
libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
-BF_BOOST_LIBPATH = '#../lib/windows/boost/lib'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===
--- trunk/blender/build_files/scons/config/win64-vc-config.py   2011-11-09 
17:18:37 UTC (rev 41703)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py   2011-11-09 
17:22:55 UTC (rev 41704)
@@ -156,17 +156,17 @@
 WITH_BF_CYCLES = True
 
 WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '#../lib/win64/openimageio/include'
+BF_OIIO = '${LIBDIR}/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
 BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-BF_OIIO_LIBPATH = '#../lib/win64/openimageio/lib'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 
 WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '#../lib/win64/boost/include'
+BF_BOOST = '${LIBDIR}/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
 BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 
libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 
libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
-BF_BOOST_LIBPATH = '#../lib/win64/boost/lib'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2011-11-09 17:18:37 UTC 
(rev 41703)
+++ trunk/blender/build_files/scons/tools/btools.py 2011-11-09 17:22:55 UTC 
(rev 41704)
@@ -240,6 +240,7 @@
 localopts = Variables.Variables(cfg, args)
 localopts.AddVariables(
 ('LCGDIR', 'location of cvs lib dir'),
+('LIBDIR', 'root dir of libs'),
 (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
 (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to 
track invalid data to prevent crash on access (at the expense of some 
effeciency)', False)),
 ('BF_PYTHON', 'Base path for python', ''),
@@ -541,11 +542,13 @@
 (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
 
 (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
+('BF_OIIO', 'OIIO root path', ''),
 ('BF_OIIO_INC', 'OIIO include path', ''),
 ('BF_OIIO_LIB', 'OIIO library', ''),
 ('BF_OIIO_LIBPATH', 'OIIO library path', ''),
 
 (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)),
+('BF_BOOST', 'Boost root path', ''),
 ('BF_BOOST_INC', 'Boost include path', ''),
 ('BF_BOOST_LIB', 'Boost library', ''),
 ('BF_BOOST_LIBPATH', 'Boost library path', '')

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41682] trunk/blender: Add compiles support for Cycles.

[Nathan Letwory]

Revision: 41682
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41682
Author:   jesterking
Date: 2011-11-08 20:40:02 + (Tue, 08 Nov 2011)
Log Message:
---
Add compiles support for Cycles.

No CUDA compiling yet, will be added later.

Modified Paths:
--
trunk/blender/SConstruct
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/intern/SConscript
trunk/blender/source/blender/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/python/SConscript

Added Paths:
---
trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2011-11-08 20:27:37 UTC (rev 41681)
+++ trunk/blender/SConstruct2011-11-08 20:40:02 UTC (rev 41682)
@@ -435,12 +435,12 @@
 
 Export('env')
 
+BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
+SConscript(B.root_build_dir+'/source/SConscript')
 BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
 SConscript(B.root_build_dir+'/intern/SConscript')
 BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
 SConscript(B.root_build_dir+'/extern/SConscript')
-BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
-SConscript(B.root_build_dir+'/source/SConscript')
 
 # now that we have read all SConscripts, we know what
 # libraries will be built. Create list of
@@ -526,6 +526,50 @@
 if len(source)==0:
 env.Execute(Mkdir(dir))
 scriptinstall.append(env.Install(dir=dir,source=source))
+if env['WITH_BF_CYCLES']:
+# cycles python code
+dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 
'addons','cycles')
+source=os.listdir('intern/cycles/blender/addon')
+if '.svn' in source: source.remove('.svn')
+if '_svn' in source: source.remove('_svn')
+if '__pycache__' in source: source.remove('__pycache__')
+source=['intern/cycles/blender/addon/'+s for s in source]
+scriptinstall.append(env.Install(dir=dir,source=source))
+
+# cycles kernel code
+dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 
'addons','cycles', 'kernel')
+source=os.listdir('intern/cycles/kernel')
+if '.svn' in source: source.remove('.svn')
+if '_svn' in source: source.remove('_svn')
+if '__pycache__' in source: source.remove('__pycache__')
+source.remove('kernel.cpp')
+source.remove('CMakeLists.txt')
+source.remove('svm')
+source.remove('osl')
+source=['intern/cycles/kernel/'+s for s in source]
+source.append('intern/cycles/util/util_color.h')
+source.append('intern/cycles/util/util_math.h')
+source.append('intern/cycles/util/util_transform.h')
+source.append('intern/cycles/util/util_types.h')
+scriptinstall.append(env.Install(dir=dir,source=source))
+# svm
+dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 
'addons','cycles', 'kernel', 'svm')
+source=os.listdir('intern/cycles/kernel/svm')
+if '.svn' in source: source.remove('.svn')
+if '_svn' in source: source.remove('_svn')
+if '__pycache__' in source: source.remove('__pycache__')
+source=['intern/cycles/kernel/svm/'+s for s in source]
+scriptinstall.append(env.Install(dir=dir,source=source))
+
+# licenses
+dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 
'addons','cycles', 'license')
+source=os.listdir('intern/cycles/doc/license')
+if '.svn' in source: source.remove('.svn')
+if '_svn' in source: source.remove('_svn')
+if '__pycache__' in source: source.remove('__pycache__')
+source.remove('CMakeLists.txt')
+source=['intern/cycles/doc/license/'+s for s in source]
+scriptinstall.append(env.Install(dir=dir,source=source))
 
 if env['WITH_BF_INTERNATIONAL']:
 internationalpaths=['release' + os.sep + 'datafiles']
@@ -696,6 +740,9 @@
 dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll') 
 dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
+if env['WITH_BF_OIIO']:
+dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
+
 dllsources.append('#source/icons/blender.exe.manifest')
 
 windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41678] trunk/blender/intern/audaspace/ SConscript: Remove redundant .remove()

[Nathan Letwory]

Revision: 41678
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41678
Author:   jesterking
Date: 2011-11-08 19:04:19 + (Tue, 08 Nov 2011)
Log Message:
---
Remove redundant .remove()

Modified Paths:
--
trunk/blender/intern/audaspace/SConscript

Modified: trunk/blender/intern/audaspace/SConscript
===
--- trunk/blender/intern/audaspace/SConscript   2011-11-08 18:58:29 UTC (rev 
41677)
+++ trunk/blender/intern/audaspace/SConscript   2011-11-08 19:04:19 UTC (rev 
41678)
@@ -3,8 +3,6 @@
 Import ('env')
 
 sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp')
-# file already included in AUD_JOSResampleReader.cpp
-sources.remove('intern/AUD_JOSResampleReaderCoeff.cpp')
 incs = '. intern FX ' + env['BF_PTHREADS_INC']
 defs = []
 

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41098] tags/blender-2.60-release/blender/ release/scripts/: Point bf-blender 2.60 release to correct bf-extensions.

[Nathan Letwory]

Revision: 41098
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41098
Author:   jesterking
Date: 2011-10-17 17:52:14 + (Mon, 17 Oct 2011)
Log Message:
---
Point bf-blender 2.60 release to correct bf-extensions.

Property Changed:

tags/blender-2.60-release/blender/release/scripts/


Property changes on: tags/blender-2.60-release/blender/release/scripts
___
Modified: svn:externals
   - addons 
https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons

   + addons 
https://svn.blender.org/svnroot/bf-extensions/tags/2_60_release/py/scripts/addons


___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41097] tags/blender-2.60-release/: Tagging bf-blender trunk for release of Blender 2.60.

[Nathan Letwory]

Revision: 41097
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41097
Author:   jesterking
Date: 2011-10-17 17:48:37 + (Mon, 17 Oct 2011)
Log Message:
---
Tagging bf-blender trunk for release of Blender 2.60.

Note: bf-extensions tagging still pending!

Added Paths:
---
tags/blender-2.60-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40939] trunk/blender/doc/build_systems/ scons-dev.txt: Commit testing notifier hack

[Nathan Letwory]

Revision: 40939
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40939
Author:   jesterking
Date: 2011-10-11 17:30:08 + (Tue, 11 Oct 2011)
Log Message:
---
Commit testing notifier hack

Modified Paths:
--
trunk/blender/doc/build_systems/scons-dev.txt

Modified: trunk/blender/doc/build_systems/scons-dev.txt
===
--- trunk/blender/doc/build_systems/scons-dev.txt   2011-10-11 17:19:55 UTC 
(rev 40938)
+++ trunk/blender/doc/build_systems/scons-dev.txt   2011-10-11 17:30:08 UTC 
(rev 40939)
@@ -189,6 +189,6 @@
 need changes elsewhere in the system, as it is handled automatically
 with the central library repository.
 
-Enjoy the new system!
+Enjoy the new system!!
 
 /Nathan Letwory (jesterKing)

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40749] trunk/blender/intern/audaspace/ SConscript: Typo fix. nexYon commit caused bit-loss in the word incs.

[Nathan Letwory]

Revision: 40749
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40749
Author:   jesterking
Date: 2011-10-02 17:58:21 + (Sun, 02 Oct 2011)
Log Message:
---
Typo fix. nexYon commit caused bit-loss in the word incs.

Modified Paths:
--
trunk/blender/intern/audaspace/SConscript

Modified: trunk/blender/intern/audaspace/SConscript
===
--- trunk/blender/intern/audaspace/SConscript   2011-10-02 17:53:52 UTC (rev 
40748)
+++ trunk/blender/intern/audaspace/SConscript   2011-10-02 17:58:21 UTC (rev 
40749)
@@ -3,7 +3,7 @@
 Import ('env')
 
 sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp') + 
env.Glob('SRC/*.cpp')
-ncs = '. intern FX SRC ' + env['BF_PTHREADS_INC']
+incs = '. intern FX SRC ' + env['BF_PTHREADS_INC']
 defs = []
 
 if env['WITH_BF_FFMPEG']:

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40748] trunk/blender/build_files/scons/ config: Make sure that default settings have OpenMP support by default ( also good for buildbots).

[Nathan Letwory]

Revision: 40748
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40748
Author:   jesterking
Date: 2011-10-02 17:53:52 + (Sun, 02 Oct 2011)
Log Message:
---
Make sure that default settings have OpenMP support by default (also good for 
buildbots).

Note that builders that don't have VS pro version need to manually disable this 
setting in their respective user-config.py

Modified Paths:
--
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===
--- trunk/blender/build_files/scons/config/win32-vc-config.py   2011-10-02 
17:16:28 UTC (rev 40747)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py   2011-10-02 
17:53:52 UTC (rev 40748)
@@ -147,6 +147,8 @@
 
 WITH_BF_3DMOUSE = True
 
+WITH_BF_OPENMP = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===
--- trunk/blender/build_files/scons/config/win64-vc-config.py   2011-10-02 
17:16:28 UTC (rev 40747)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py   2011-10-02 
17:53:52 UTC (rev 40748)
@@ -151,6 +151,8 @@
 
 WITH_BF_3DMOUSE = True
 
+WITH_BF_OPENMP = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40386] trunk/blender/build_files/scons/ config/win64-vc-config.py: Don't set BF_NUMJOBS in default config, but instead let users do that in user-conf

[Nathan Letwory]

Revision: 40386
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40386
Author:   jesterking
Date: 2011-09-20 07:53:20 + (Tue, 20 Sep 2011)
Log Message:
---
Don't set BF_NUMJOBS in default config, but instead let users do that in 
user-config.py.

Modified Paths:
--
trunk/blender/build_files/scons/config/win64-vc-config.py

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===
--- trunk/blender/build_files/scons/config/win64-vc-config.py   2011-09-20 
07:47:27 UTC (rev 40385)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py   2011-09-20 
07:53:20 UTC (rev 40386)
@@ -188,11 +188,6 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 
'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-if BF_DEBUG:
-   BF_NUMJOBS=1
-else:
-   BF_NUMJOBS=6
-
 PLATFORM_LINKFLAGS = 
['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO',
 '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', 
'/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
 
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40174] tags/blender-2.59-release/blender/ release/scripts/: Point to proper addons tag.

[Nathan Letwory]

Revision: 40174
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40174
Author:   jesterking
Date: 2011-09-12 19:03:24 + (Mon, 12 Sep 2011)
Log Message:
---
Point to proper addons tag.

Property Changed:

tags/blender-2.59-release/blender/release/scripts/


Property changes on: tags/blender-2.59-release/blender/release/scripts
___
Modified: svn:externals
   - addons 
https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons

   + addons 
https://svn.blender.org/svnroot/bf-extensions/tags/2_59_release/py/scripts/addons


___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40173] tags/blender-2.59-release/: Tag r39307 for blender 2.59 release

[Nathan Letwory]

Revision: 40173
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40173
Author:   jesterking
Date: 2011-09-12 18:54:42 + (Mon, 12 Sep 2011)
Log Message:
---
Tag r39307 for blender 2.59 release

Revision Links:
--

http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39307

Added Paths:
---
tags/blender-2.59-release/

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40164] trunk/blender/source/blender/ collada: Fix [#28614] Collada Exporter does not export Ambient term

[Nathan Letwory]

Revision: 40164
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40164
Author:   jesterking
Date: 2011-09-12 13:20:24 + (Mon, 12 Sep 2011)
Log Message:
---
Fix [#28614] Collada Exporter does not export Ambient term
reported by Steiner Bernhard

ma->ambX is calculated only on a render, so instead of relying on those values 
compute them manually.

Modified Paths:
--
trunk/blender/source/blender/collada/EffectExporter.cpp
trunk/blender/source/blender/collada/EffectExporter.h

Modified: trunk/blender/source/blender/collada/EffectExporter.cpp
===
--- trunk/blender/source/blender/collada/EffectExporter.cpp 2011-09-12 
13:13:56 UTC (rev 40163)
+++ trunk/blender/source/blender/collada/EffectExporter.cpp 2011-09-12 
13:20:24 UTC (rev 40164)
@@ -37,6 +37,7 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_texture_types.h"
+#include "DNA_world_types.h"
 
 #include "BKE_customdata.h"
 
@@ -81,6 +82,7 @@
 void EffectsExporter::exportEffects(Scene *sce)
 {
if(hasEffects(sce)) {
+   this->scene = sce;
openLibrary();
MaterialFunctor mf;
mf.forEachMaterialInScene(sce, *this, 
this->export_settings->selected);
@@ -175,7 +177,8 @@
ep.setDiffuse(cot, false , "diffuse");
 
// ambient
-   cot = getcol(ma->ambr, ma->ambg, ma->ambb, 1.0f);
+   /* ma->ambX is calculated only on render, so lets do it here manually 
and not rely on ma->ambX. */
+   cot = getcol(this->scene->world->ambr*ma->amb, 
this->scene->world->ambg*ma->amb, this->scene->world->ambb*ma->amb, 1.0f);
ep.setAmbient(cot, false , "ambient");
 
// reflective, reflectivity

Modified: trunk/blender/source/blender/collada/EffectExporter.h
===
--- trunk/blender/source/blender/collada/EffectExporter.h   2011-09-12 
13:13:56 UTC (rev 40163)
+++ trunk/blender/source/blender/collada/EffectExporter.h   2011-09-12 
13:20:24 UTC (rev 40164)
@@ -70,6 +70,8 @@
bool hasEffects(Scene *sce);

const ExportSettings *export_settings;
+   
+   Scene *scene;
 };
 
 #endif

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40160] trunk/blender/source/blender/ collada/ErrorHandler.cpp: Code shuffle so function has only one exit point.

[Nathan Letwory]

Revision: 40160
  
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40160
Author:   jesterking
Date: 2011-09-12 10:57:41 + (Mon, 12 Sep 2011)
Log Message:
---
Code shuffle so function has only one exit point.

Modified Paths:
--
trunk/blender/source/blender/collada/ErrorHandler.cpp

Modified: trunk/blender/source/blender/collada/ErrorHandler.cpp
===
--- trunk/blender/source/blender/collada/ErrorHandler.cpp   2011-09-12 
09:55:04 UTC (rev 40159)
+++ trunk/blender/source/blender/collada/ErrorHandler.cpp   2011-09-12 
10:57:41 UTC (rev 40160)
@@ -49,6 +49,8 @@
 //
 bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
 {
+   mError = true;
+   
if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER )
{
COLLADASaxFWL::SaxParserError* saxParserError = 
(COLLADASaxFWL::SaxParserError*) error;
@@ -59,32 +61,29 @@
{
if ( strcmp(parserError.getElement(), "effect") == 0 )
{
-   return false;
+   mError = false;
}
}
if ( parserError.getErrorType() == 
GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
{
-   if ( (strcmp(parserError.getElement(), "extra") == 0) 
-   && 
(strcmp(parserError.getAdditionalText().c_str(), "sibling: 
fx_profile_abstract") == 0)) 
+   if ( !((strcmp(parserError.getElement(), "extra") == 0) 
+   && 
(strcmp(parserError.getAdditionalText().c_str(), "sibling: 
fx_profile_abstract") == 0)))
{
-   return false;
+   mError = false;
}
}
 
if ( parserError.getErrorType() == 
GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE)
{
std::cout << "Couldn't open file" << std::endl;
-   mError = true;
}
 
std::cout << "Schema validation error: " << 
parserError.getErrorMessage() << std::endl;
-   mError = true;
}
else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL 
)
{
COLLADASaxFWL::SaxFWLError* saxFWLError = 
(COLLADASaxFWL::SaxFWLError*) error;
std::cout << "Sax FWL Error: " << 
saxFWLError->getErrorMessage() << std::endl;
-   mError = true;
}
return false;
 }

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs