[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32245] trunk/blender/source/blender/ collada/DocumentExporter.cpp: Patch [#23589] Use Author field from User Preferences for COLLADA export.
Nathan Letwory
nathan at letworyinteractive.com
Sat Oct 2 11:42:35 CEST 2010
Revision: 32245
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32245
Author: jesterking
Date: 2010-10-02 11:42:35 +0200 (Sat, 02 Oct 2010)
Log Message:
-----------
Patch [#23589] Use Author field from User Preferences for COLLADA export.
Submitted by Imran Syed.
When U.author is set, it'll be used instead of default "Blender User".
Modified Paths:
--------------
trunk/blender/source/blender/collada/DocumentExporter.cpp
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2010-10-02 09:28:41 UTC (rev 32244)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2010-10-02 09:42:35 UTC (rev 32245)
@@ -25,6 +25,8 @@
#include <stdio.h>
#include <math.h>
+extern "C"
+{
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
@@ -39,9 +41,8 @@
#include "DNA_curve_types.h"
#include "DNA_armature_types.h"
#include "DNA_modifier_types.h"
+#include "DNA_userdef_types.h"
-extern "C"
-{
#include "BKE_DerivedMesh.h"
#include "BKE_fcurve.h"
#include "BKE_animsys.h"
@@ -1645,7 +1646,6 @@
else if (ma->spec_shader == MA_SPEC_PHONG) {
ep.setShaderType(COLLADASW::EffectProfile::PHONG);
// shininess
- // XXX not sure, stolen this from previous Collada plugin
ep.setShininess(ma->har);
}
else {
@@ -2627,7 +2627,12 @@
asset.setUnit("decimetre", 0.1);
asset.setUpAxisType(COLLADASW::Asset::Z_UP);
// TODO: need an Author field in userpref
- asset.getContributor().mAuthor = "Blender User";
+ if(strlen(U.author) > 0) {
+ asset.getContributor().mAuthor = U.author;
+ }
+ else {
+ asset.getContributor().mAuthor = "Blender User";
+ }
#ifdef NAN_BUILDINFO
char version_buf[128];
sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
More information about the Bf-blender-cvs
mailing list