[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21221] branches/soc-2009-yukishiro: merge till 21219

Jingyuan Huang jingyuan.huang at gmail.com
Sun Jun 28 15:42:09 CEST 2009


Revision: 21221
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21221
Author:   yukishiro
Date:     2009-06-28 15:42:09 +0200 (Sun, 28 Jun 2009)

Log Message:
-----------
merge till 21219

Modified Paths:
--------------
    branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/displist.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_icons.c
    branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-yukishiro/source/blender/python/generic/BGL.c
    branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
    branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
    branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
    branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
    branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/ListValue.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.cpp
    branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ANDController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NANDController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XNORController.h
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XORController.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CDActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_StateActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VisibilityActuator.h

Modified: branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj	2009-06-28 13:41:50 UTC (rev 21220)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj	2009-06-28 13:42:09 UTC (rev 21221)
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\extern\solid\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenfont"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT;WITH_FFMPEG"
 				StringPooling="true"
 				BasicRuntimeChecks="0"

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c	2009-06-28 13:41:50 UTC (rev 21220)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c	2009-06-28 13:42:09 UTC (rev 21221)
@@ -358,6 +358,9 @@
 		return 1;
 	}
 
+	list->first= NULL;
+	list->last= NULL;
+
 	return 0;
 }
 

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/displist.c	2009-06-28 13:41:50 UTC (rev 21220)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/displist.c	2009-06-28 13:42:09 UTC (rev 21221)
@@ -315,13 +315,19 @@
 
 static Render *fastshade_get_render(Scene *scene)
 {
-	Render *re= RE_GetRender("_Shade View_");
-	if(re==NULL) {
-		re= RE_NewRender("_Shade View_");
+	/* XXX ugly global still, but we can't do preview while rendering */
+	if(G.rendering==0) {
+		
+		Render *re= RE_GetRender("_Shade View_");
+		if(re==NULL) {
+			re= RE_NewRender("_Shade View_");
+		
+			RE_Database_Baking(re, scene, 0, 0);	/* 0= no faces */
+		}
+		return re;
+	}
 	
-		RE_Database_Baking(re, scene, 0, 0);	/* 0= no faces */
-	}
-	return re;
+	return NULL;
 }
 
 /* called on file reading */
@@ -611,18 +617,20 @@
 
 void shadeMeshMCol(Scene *scene, Object *ob, Mesh *me)
 {
+	Render *re= fastshade_get_render(scene);
 	int a;
 	char *cp;
 	unsigned int *mcol= (unsigned int*)me->mcol;
 	
-	Render *re= fastshade_get_render(scene);
-	mesh_create_shadedColors(re, ob, 1, &mcol, NULL);
-	me->mcol= (MCol*)mcol;
+	if(re) {
+		mesh_create_shadedColors(re, ob, 1, &mcol, NULL);
+		me->mcol= (MCol*)mcol;
 
-	/* swap bytes */
-	for(cp= (char *)me->mcol, a= 4*me->totface; a>0; a--, cp+=4) {
-		SWAP(char, cp[0], cp[3]);
-		SWAP(char, cp[1], cp[2]);
+		/* swap bytes */
+		for(cp= (char *)me->mcol, a= 4*me->totface; a>0; a--, cp+=4) {
+			SWAP(char, cp[0], cp[3]);
+			SWAP(char, cp[1], cp[2]);
+		}
 	}
 }
 
@@ -641,6 +649,8 @@
 	int a, need_orco;
 	
 	re= fastshade_get_render(scene);
+	if(re==NULL)
+		return;
 	
 	dl = find_displist(&ob->disp, DL_VERTCOL);
 	if (dl) {

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c	2009-06-28 13:41:50 UTC (rev 21220)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c	2009-06-28 13:42:09 UTC (rev 21221)
@@ -1812,7 +1812,7 @@
 	Render *re= NULL;
 	RenderResult *rr= NULL;
 	
-	if(iuser->scene) {
+	if(iuser && iuser->scene) {
 		re= RE_GetRender(iuser->scene->id.name);
 		rr= RE_GetResult(re);
 	}

Modified: branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c	2009-06-28 13:41:50 UTC (rev 21220)
+++ branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c	2009-06-28 13:42:09 UTC (rev 21221)
@@ -112,6 +112,9 @@
 	/* tooltip */
 	ARegion *tooltip;
 	wmTimer *tooltiptimer;
+	
+	/* auto open */
+	int used_mouse;
 	wmTimer *autoopentimer;
 
 	/* text selection/editing */
@@ -3344,7 +3347,7 @@
 
 		/* automatic open pulldown block timer */
 		if(ELEM3(but->type, BLOCK, PULLDOWN, ICONTEXTROW)) {
-			if(!data->autoopentimer) {
+			if(data->used_mouse && !data->autoopentimer) {
 				int time;
 
 				if(but->block->auto_open==2) time= 1;    // test for toolbox
@@ -3447,6 +3450,9 @@
 		if(but->block->auto_open_last+BUTTON_AUTO_OPEN_THRESH < PIL_check_seconds_timer())
 			but->block->auto_open= 0;
 
+	if(type == BUTTON_ACTIVATE_OVER) {
+		data->used_mouse= 1;
+	}
 	button_activate_state(C, but, BUTTON_STATE_HIGHLIGHT);
 	
 	if(type == BUTTON_ACTIVATE_OPEN) {
@@ -3765,12 +3771,19 @@
 		button_activate_exit(C, data, but, 1);
 	}
 	else if(menu->menuretval == UI_RETURN_OUT) {

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list