Revision: 14974
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14974
Author: bdiego
Date: 2008-05-26 07:43:50 +0200 (Mon, 26 May 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Rev: 14892
Rev: 14893
Rev: 14896
Rev: 14902
Rev: 14905
Rev: 14906
Rev: 14907
Rev: 14908
Rev: 14909
Rev: 14911
Rev: 14912
Rev: 14916
Rev: 14923
Rev: 14925
Rev: 14926
Rev: 14928
Rev: 14930
Rev: 14931
Rev: 14932
Rev: 14935
Rev: 14936
Rev: 14937
Rev: 14938
Rev: 14939
Rev: 14940
Rev: 14941
Rev: 14942
Rev: 14947
Rev: 14948
Rev: 14950
Rev: 14955
Rev: 14957
Rev: 14958
Rev: 14961
Rev: 14965
Rev: 14966
Rev: 14971
Rev: 14973
Modified Paths:
--------------
branches/blender-2.47/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/blender-2.47/release/scripts/3ds_import.py
branches/blender-2.47/release/scripts/export_fbx.py
branches/blender-2.47/release/scripts/flt_import.py
branches/blender-2.47/release/scripts/uvcalc_lightmap.py
branches/blender-2.47/source/blender/blenkernel/intern/anim.c
branches/blender-2.47/source/blender/blenkernel/intern/blender.c
branches/blender-2.47/source/blender/blenkernel/intern/displist.c
branches/blender-2.47/source/blender/blenkernel/intern/modifier.c
branches/blender-2.47/source/blender/blenkernel/intern/particle.c
branches/blender-2.47/source/blender/blenkernel/intern/softbody.c
branches/blender-2.47/source/blender/blenloader/intern/readfile.c
branches/blender-2.47/source/blender/include/BDR_editcurve.h
branches/blender-2.47/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/blender-2.47/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/blender-2.47/source/blender/python/api2_2x/Draw.c
branches/blender-2.47/source/blender/python/api2_2x/NLA.c
branches/blender-2.47/source/blender/python/api2_2x/Window.c
branches/blender-2.47/source/blender/python/api2_2x/doc/API_intro.py
branches/blender-2.47/source/blender/python/api2_2x/doc/Blender.py
branches/blender-2.47/source/blender/python/api2_2x/doc/Mesh.py
branches/blender-2.47/source/blender/python/api2_2x/doc/NLA.py
branches/blender-2.47/source/blender/python/api2_2x/doc/Render.py
branches/blender-2.47/source/blender/python/api2_2x/sceneRender.c
branches/blender-2.47/source/blender/render/intern/source/envmap.c
branches/blender-2.47/source/blender/render/intern/source/texture.c
branches/blender-2.47/source/blender/src/buttons_editing.c
branches/blender-2.47/source/blender/src/buttons_object.c
branches/blender-2.47/source/blender/src/buttons_scene.c
branches/blender-2.47/source/blender/src/buttons_shading.c
branches/blender-2.47/source/blender/src/drawarmature.c
branches/blender-2.47/source/blender/src/drawobject.c
branches/blender-2.47/source/blender/src/editaction.c
branches/blender-2.47/source/blender/src/editarmature.c
branches/blender-2.47/source/blender/src/editconstraint.c
branches/blender-2.47/source/blender/src/editcurve.c
branches/blender-2.47/source/blender/src/editseq.c
branches/blender-2.47/source/blender/src/header_image.c
branches/blender-2.47/source/blender/src/sequence.c
branches/blender-2.47/source/blender/src/space.c
branches/blender-2.47/source/blender/src/transform.c
branches/blender-2.47/source/blender/src/transform_conversions.c
branches/blender-2.47/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.h
branches/blender-2.47/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/blender-2.47/source/gameengine/Rasterizer/RAS_CameraData.h
branches/blender-2.47/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Added Paths:
-----------
branches/blender-2.47/source/gameengine/PyDoc/epy_docgen.sh
Removed Paths:
-------------
branches/blender-2.47/source/gameengine/PyDoc/Makefile
Modified: branches/blender-2.47/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/blender-2.47/intern/ghost/intern/GHOST_WindowWin32.cpp
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/intern/ghost/intern/GHOST_WindowWin32.cpp
2008-05-26 05:43:50 UTC (rev 14974)
@@ -871,12 +871,25 @@
for(i=1; i<=n; i++) { /* not the idiom, but it's right */
::DescribePixelFormat( hdc, i, sizeof(PIXELFORMATDESCRIPTOR),
&pfd );
w = WeightPixelFormat(pfd);
- if(w > weight) {
- weight = w;
- iPixelFormat = i;
+ // be strict on stereo
+ if (!((sPreferredFormat.dwFlags ^ pfd.dwFlags) & PFD_STEREO))
{
+ if(w > weight) {
+ weight = w;
+ iPixelFormat = i;
+ }
}
}
-
+ if (weight == 0) {
+ // we could find the correct stereo setting, just find any
suitable format
+ for(i=1; i<=n; i++) { /* not the idiom, but it's right */
+ ::DescribePixelFormat( hdc, i,
sizeof(PIXELFORMATDESCRIPTOR), &pfd );
+ w = WeightPixelFormat(pfd);
+ if(w > weight) {
+ weight = w;
+ iPixelFormat = i;
+ }
+ }
+ }
return iPixelFormat;
}
Modified: branches/blender-2.47/release/scripts/3ds_import.py
===================================================================
--- branches/blender-2.47/release/scripts/3ds_import.py 2008-05-25 23:05:13 UTC
(rev 14973)
+++ branches/blender-2.47/release/scripts/3ds_import.py 2008-05-26 05:43:50 UTC
(rev 14974)
@@ -419,7 +419,7 @@
ob.setMatrix(contextMatrix_rot)
importedObjects.append(ob)
-
+ bmesh.calcNormals()
for matName, faces in myContextMeshMaterials.iteritems():
makeMeshMaterialCopy(matName, faces)
@@ -664,9 +664,8 @@
#print contextLamp.name,
elif (new_chunk.ID==OBJECT_MESH):
- ## @@ PATCH
- print 'Found an OBJECT_MESH chunk'
-
+ # print 'Found an OBJECT_MESH chunk'
+ pass
elif (new_chunk.ID==OBJECT_VERTICES):
'''
Worldspace vertex locations
Modified: branches/blender-2.47/release/scripts/export_fbx.py
===================================================================
--- branches/blender-2.47/release/scripts/export_fbx.py 2008-05-25 23:05:13 UTC
(rev 14973)
+++ branches/blender-2.47/release/scripts/export_fbx.py 2008-05-26 05:43:50 UTC
(rev 14974)
@@ -1101,12 +1101,12 @@
file.write('\n\t\t\tProperty: "ShadingModel", "KString", "",
"%s"' % mat_shader)
file.write('\n\t\t\tProperty: "MultiLayer", "bool", "",0')
file.write('\n\t\t\tProperty: "EmissiveColor", "ColorRGB",
"",%.4f,%.4f,%.4f' % mat_cold) # emit and diffuse color are he same in blender
- file.write('\n\t\t\tProperty: "EmissiveFactor", "double",
"",%.4f' % mat_dif)
+ file.write('\n\t\t\tProperty: "EmissiveFactor", "double",
"",%.4f' % mat_emit)
file.write('\n\t\t\tProperty: "AmbientColor", "ColorRGB",
"",%.4f,%.4f,%.4f' % mat_colamb)
file.write('\n\t\t\tProperty: "AmbientFactor", "double",
"",%.4f' % mat_amb)
file.write('\n\t\t\tProperty: "DiffuseColor", "ColorRGB",
"",%.4f,%.4f,%.4f' % mat_cold)
- file.write('\n\t\t\tProperty: "DiffuseFactor", "double",
"",%.4f' % mat_emit)
+ file.write('\n\t\t\tProperty: "DiffuseFactor", "double",
"",%.4f' % mat_dif)
file.write('\n\t\t\tProperty: "Bump", "Vector3D", "",0,0,0')
file.write('\n\t\t\tProperty: "TransparentColor", "ColorRGB",
"",1,1,1')
file.write('\n\t\t\tProperty: "TransparencyFactor", "double",
"",%.4f' % (1.0 - mat_alpha))
Modified: branches/blender-2.47/release/scripts/flt_import.py
===================================================================
--- branches/blender-2.47/release/scripts/flt_import.py 2008-05-25 23:05:13 UTC
(rev 14973)
+++ branches/blender-2.47/release/scripts/flt_import.py 2008-05-26 05:43:50 UTC
(rev 14974)
@@ -16,7 +16,7 @@
registered trademark of MultiGen-Paradigm, Inc.
Feature overview and more availible at:
-http://wiki.blender.org/index.php/Scripts/Manual/Import/openflight_flt
+http://wiki.blender.org/index.php/Scripts/Manual/Import/openflight_fltss
Note: This file is a grab-bag of old and new code. It needs some cleanup still.
"""
@@ -44,6 +44,7 @@
import BPyImage
import flt_filewalker
import flt_properties
+import sys
reload(flt_properties)
from flt_properties import *
@@ -1036,8 +1037,9 @@
else: # fgon
mesh_face_indicies = [i+vert_index for i in
xrange(face_len)]
tri_ngons= ngon(self.mesh, mesh_face_indicies)
- new_faces.extend([ [mesh_face_indicies[t] for t
in tri] for tri in tri_ngons])
- new_faces_props.extend( [ (None, image,
(uvs[tri[0]], uvs[tri[1]], uvs[tri[2]]), [flt_face.uverts[tri[0]],
flt_face.uverts[tri[1]], flt_face.uverts[tri[2]]], flt_face.uvlayers,
flt_face.color_index, flt_face.props,FLT_OrigIndex,1, flt_face.subfacelevel)
for tri in tri_ngons ])
+ if len(tri_ngons) != 1:
+ new_faces.extend([
[mesh_face_indicies[t] for t in tri] for tri in tri_ngons])
+ new_faces_props.extend( [ (None, image,
(uvs[tri[0]], uvs[tri[1]], uvs[tri[2]]), [flt_face.uverts[tri[0]],
flt_face.uverts[tri[1]], flt_face.uverts[tri[2]]], flt_face.uvlayers,
flt_face.color_index, flt_face.props,FLT_OrigIndex,1, flt_face.subfacelevel)
for tri in tri_ngons ])
vert_index+= face_len
FLT_OrigIndex+=1
@@ -2296,7 +2298,6 @@
for v in rmesh.verts:
v.co = v.co * smat
-
def reparent(root,childhash,sce):
for child in childhash[root]:
reparent(child,childhash,sce)
@@ -2452,7 +2453,7 @@
select_file(global_prefs['fltfile'], GRR)
except:
import traceback
- FLTWarn = Draw.PupBlock("Export Error", ["See console
for output!"])
+ FLTWarn = Draw.PupBlock("Ixport Error", ["See console
for output!"])
traceback.print_exception(sys.exc_type, sys.exc_value,
sys.exc_traceback)
#choose base path for export
Modified: branches/blender-2.47/release/scripts/uvcalc_lightmap.py
===================================================================
--- branches/blender-2.47/release/scripts/uvcalc_lightmap.py 2008-05-25
23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/release/scripts/uvcalc_lightmap.py 2008-05-26
05:43:50 UTC (rev 14974)
@@ -328,6 +328,9 @@
if curr_len/4 < side_len/PREF_MARGIN_DIV:
break
+ if not lengths:
+ lengths.append(curr_len)
+
# convert into ints
lengths_to_ints = {}
Modified: branches/blender-2.47/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/anim.c
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/source/blender/blenkernel/intern/anim.c
2008-05-26 05:43:50 UTC (rev 14974)
@@ -881,8 +881,7 @@
if(part->draw_as==PART_DRAW_GR &&
psys->part->draw & PART_DRAW_WHOLE_GR) {
for(go= part->dup_group->gobject.first,
b=0; go; go= go->next, b++) {
-
- Mat4MulMat4(tmat, obmat, pamat);
+ Mat4MulMat4(tmat,
oblist[b]->obmat, pamat);
Mat4MulFloat3((float *)tmat,
size*scale);
if(par_space_mat)
Mat4MulMat4(mat, tmat,
par_space_mat);
@@ -890,7 +889,7 @@
Mat4CpyMat4(mat, tmat);
dob= new_dupli_object(lb,
go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
- Mat4CpyMat4(dob->omat,
oldobmat);
+ Mat4CpyMat4(dob->omat,
obcopylist[b].obmat);
if(G.rendering)
psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
}
Modified: branches/blender-2.47/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/blender.c
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/source/blender/blenkernel/intern/blender.c
2008-05-26 05:43:50 UTC (rev 14974)
@@ -621,7 +621,8 @@
}
}
-/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current
situation */
+/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current
situation
+ * Note, ALWAYS call sound_initialize_sounds after BKE_undo_step() */
void BKE_undo_step(int step)
{
Modified: branches/blender-2.47/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/displist.c
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/source/blender/blenkernel/intern/displist.c
2008-05-26 05:43:50 UTC (rev 14974)
@@ -1171,7 +1171,7 @@
if ((md->mode & required_mode) != required_mode) continue;
if (mti->isDisabled && mti->isDisabled(md)) continue;
- if (md->type==eModifierType_Hook ||
md->type==eModifierType_Softbody) {
+ if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody,
eModifierType_MeshDeform)) {
preTesselatePoint = md;
}
}
Modified: branches/blender-2.47/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/modifier.c
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/source/blender/blenkernel/intern/modifier.c
2008-05-26 05:43:50 UTC (rev 14974)
@@ -6850,9 +6850,17 @@
Mat3CpyMat4(icagemat, iobmat);
/* bind weights if needed */
- if(!mmd->bindcos)
- harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
+ if(!mmd->bindcos) {
+ static int recursive = 0;
+ /* progress bar redraw can make this recursive .. */
+ if(!recursive) {
+ recursive = 1;
+ harmonic_coordinates_bind(mmd, vertexCos, numVerts,
cagemat);
+ recursive = 0;
+ }
+ }
+
/* verify we have compatible weights */
totvert= numVerts;
totcagevert= cagedm->getNumVerts(cagedm);
Modified: branches/blender-2.47/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/particle.c
2008-05-25 23:05:13 UTC (rev 14973)
+++ branches/blender-2.47/source/blender/blenkernel/intern/particle.c
2008-05-26 05:43:50 UTC (rev 14974)
@@ -2401,8 +2401,11 @@
psys->pathcache= cache;
}
- if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE)
+ if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE) {
soft = psys->soft;
+ if(!soft->bpoint)
+ soft= NULL;
+ }
psys->lattice = psys_get_lattice(ob, psys);
ma= give_current_material(ob, psys->part->omat);
Modified: branches/blender-2.47/source/blender/blenkernel/intern/softbody.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
