Revision: 41013
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41013
Author: ender79
Date: 2011-10-14 16:23:41 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40997:41005 (to integrate the MSVC build fixes over
to bmesh)
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40997
Modified Paths:
--------------
branches/bmesh/blender/scons/scons.py
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/collada/AnimationImporter.cpp
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40997
+ /trunk/blender:39992-41005
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40997
+ /trunk/blender/release:31524-41005
Modified: branches/bmesh/blender/scons/scons.py
===================================================================
--- branches/bmesh/blender/scons/scons.py 2011-10-14 14:01:39 UTC (rev
41012)
+++ branches/bmesh/blender/scons/scons.py 2011-10-14 16:23:41 UTC (rev
41013)
@@ -24,6 +24,15 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
+# -----------------------------------
+# quick patch to avoid user confusion
+if not hasattr(dict, "has_key"):
+ import sys
+ print("Python2.x needed, using %d.%d\nAborting!\n" % sys.version_info[:2])
+ sys.exit(1)
+# end patch - campbell
+# --------------------
+
__revision__ = "src/script/scons.py 4043 2009/02/23 09:06:45 scons"
__version__ = "1.2.0.d20090223"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
2011-10-14 14:01:39 UTC (rev 41012)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
2011-10-14 16:23:41 UTC (rev 41013)
@@ -63,6 +63,10 @@
#include "BKE_sequencer.h"
#include "BKE_scene.h"
+// evil quiet NaN definition
+static const int NAN_INT = 0x7FC00000;
+#define NAN_FLT *((float*)(&NAN_INT))
+
#ifdef WITH_AUDASPACE
// evil global ;-)
static int sound_cfra;
@@ -630,7 +634,7 @@
else
return AUD_getPosition(scene->sound_scene_handle);
}
- return .0f/.0f;
+ return NAN_FLT;
}
int sound_scene_playing(struct Scene *scene)
@@ -787,7 +791,7 @@
void sound_play_scene(struct Scene *UNUSED(scene)) {}
void sound_stop_scene(struct Scene *UNUSED(scene)) {}
void sound_seek_scene(struct Main *UNUSED(bmain), struct Scene *UNUSED(scene))
{}
-float sound_sync_scene(struct Scene *UNUSED(scene)) { return .0f/.0f; }
+float sound_sync_scene(struct Scene *UNUSED(scene)) { return NAN_FLT; }
int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
int sound_read_sound_buffer(struct bSound* UNUSED(sound), float*
UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) {
return 0; }
void sound_read_waveform(struct bSound* sound) { (void)sound; }
Modified: branches/bmesh/blender/source/blender/collada/AnimationImporter.cpp
===================================================================
--- branches/bmesh/blender/source/blender/collada/AnimationImporter.cpp
2011-10-14 14:01:39 UTC (rev 41012)
+++ branches/bmesh/blender/source/blender/collada/AnimationImporter.cpp
2011-10-14 16:23:41 UTC (rev 41013)
@@ -962,30 +962,32 @@
for (unsigned int j = 0; j < matBinds.getCount(); j++) {
const COLLADAFW::UniqueId & matuid =
matBinds[j].getReferencedMaterial();
const COLLADAFW::Effect *ef =
(COLLADAFW::Effect *) (FW_object_map[matuid]);
- const COLLADAFW::CommonEffectPointerArray&
commonEffects = ef->getCommonEffects();
- COLLADAFW::EffectCommon *efc = commonEffects[0];
- if((animType->material & MATERIAL_SHININESS) !=
0){
- const COLLADAFW::FloatOrParam *shin =
&(efc->getShininess());
- const COLLADAFW::UniqueId& listid =
shin->getAnimationList();
- Assign_float_animations( listid,
AnimCurves , "specular_hardness" );
- }
+ if (ef != NULL) { /* can be NULL [#28909] */
+ const
COLLADAFW::CommonEffectPointerArray& commonEffects = ef->getCommonEffects();
+ COLLADAFW::EffectCommon *efc =
commonEffects[0];
+ if((animType->material &
MATERIAL_SHININESS) != 0){
+ const COLLADAFW::FloatOrParam
*shin = &(efc->getShininess());
+ const COLLADAFW::UniqueId&
listid = shin->getAnimationList();
+ Assign_float_animations(
listid, AnimCurves , "specular_hardness" );
+ }
- if((animType->material & MATERIAL_IOR) != 0){
- const COLLADAFW::FloatOrParam *ior =
&(efc->getIndexOfRefraction());
- const COLLADAFW::UniqueId& listid =
ior->getAnimationList();
- Assign_float_animations( listid,
AnimCurves , "raytrace_transparency.ior" );
- }
+ if((animType->material & MATERIAL_IOR)
!= 0){
+ const COLLADAFW::FloatOrParam
*ior = &(efc->getIndexOfRefraction());
+ const COLLADAFW::UniqueId&
listid = ior->getAnimationList();
+ Assign_float_animations(
listid, AnimCurves , "raytrace_transparency.ior" );
+ }
- if((animType->material & MATERIAL_SPEC_COLOR)
!= 0){
- const COLLADAFW::ColorOrTexture *cot =
&(efc->getSpecular());
- const COLLADAFW::UniqueId& listid =
cot->getColor().getAnimationList();
- Assign_color_animations( listid,
AnimCurves , "specular_color" );
- }
+ if((animType->material &
MATERIAL_SPEC_COLOR) != 0){
+ const COLLADAFW::ColorOrTexture
*cot = &(efc->getSpecular());
+ const COLLADAFW::UniqueId&
listid = cot->getColor().getAnimationList();
+ Assign_color_animations(
listid, AnimCurves , "specular_color" );
+ }
- if((animType->material & MATERIAL_DIFF_COLOR)
!= 0){
- const COLLADAFW::ColorOrTexture *cot =
&(efc->getDiffuse());
- const COLLADAFW::UniqueId& listid =
cot->getColor().getAnimationList();
- Assign_color_animations( listid,
AnimCurves , "diffuse_color" );
+ if((animType->material &
MATERIAL_DIFF_COLOR) != 0){
+ const COLLADAFW::ColorOrTexture
*cot = &(efc->getDiffuse());
+ const COLLADAFW::UniqueId&
listid = cot->getColor().getAnimationList();
+ Assign_color_animations(
listid, AnimCurves , "diffuse_color" );
+ }
}
}
}
@@ -1051,14 +1053,16 @@
for (unsigned int j = 0; j < matBinds.getCount(); j++) {
const COLLADAFW::UniqueId & matuid =
matBinds[j].getReferencedMaterial();
const COLLADAFW::Effect *ef = (COLLADAFW::Effect *)
(FW_object_map[matuid]);
- const COLLADAFW::CommonEffectPointerArray&
commonEffects = ef->getCommonEffects();
- if(!commonEffects.empty()) {
- COLLADAFW::EffectCommon *efc = commonEffects[0];
- types->material =
setAnimType(&(efc->getShininess()),(types->material), MATERIAL_SHININESS);
- types->material =
setAnimType(&(efc->getSpecular().getColor()),(types->material),
MATERIAL_SPEC_COLOR);
- types->material =
setAnimType(&(efc->getDiffuse().getColor()),(types->material),
MATERIAL_DIFF_COLOR);
- // types->material =
setAnimType(&(efc->get()),(types->material), MATERIAL_TRANSPARENCY);
- types->material =
setAnimType(&(efc->getIndexOfRefraction()),(types->material), MATERIAL_IOR);
+ if (ef != NULL) { /* can be NULL [#28909] */
+ const COLLADAFW::CommonEffectPointerArray&
commonEffects = ef->getCommonEffects();
+ if(!commonEffects.empty()) {
+ COLLADAFW::EffectCommon *efc =
commonEffects[0];
+ types->material =
setAnimType(&(efc->getShininess()),(types->material), MATERIAL_SHININESS);
+ types->material =
setAnimType(&(efc->getSpecular().getColor()),(types->material),
MATERIAL_SPEC_COLOR);
+ types->material =
setAnimType(&(efc->getDiffuse().getColor()),(types->material),
MATERIAL_DIFF_COLOR);
+ // types->material =
setAnimType(&(efc->get()),(types->material), MATERIAL_TRANSPARENCY);
+ types->material =
setAnimType(&(efc->getIndexOfRefraction()),(types->material), MATERIAL_IOR);
+ }
}
}
}
@@ -1067,10 +1071,10 @@
int AnimationImporter::setAnimType ( const COLLADAFW::Animatable * prop , int
types, int addition)
{
- const COLLADAFW::UniqueId& listid = prop->getAnimationList();
- if (animlist_map.find(listid) != animlist_map.end())
- return types|addition;
- else return types;
+ const COLLADAFW::UniqueId& listid = prop->getAnimationList();
+ if (animlist_map.find(listid) != animlist_map.end())
+ return types|addition;
+ else return types;
}
// Is not used anymore.
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-40997
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41005
Modified:
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
2011-10-14 14:01:39 UTC (rev 41012)
+++ branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
2011-10-14 16:23:41 UTC (rev 41013)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3.1
+#! /usr/bin/env python3
"""
This script is used to help cleaning RNA api.
Modified:
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
===================================================================
---
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
2011-10-14 14:01:39 UTC (rev 41012)
+++
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
2011-10-14 16:23:41 UTC (rev 41013)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3.1
+#! /usr/bin/env python3
import sys
Modified:
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
---
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-10-14 14:01:39 UTC (rev 41012)
+++
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-10-14 16:23:41 UTC (rev 41013)
@@ -33,7 +33,6 @@
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include "DNA_listBase.h"
#include "DNA_screen_types.h"
@@ -47,6 +46,7 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
+#include "BLI_math.h"
#include "BKE_blender.h"
#include "BKE_context.h"
Modified:
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
---
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2011-10-14 14:01:39 UTC (rev 41012)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
