From 3f153c25be407aaa087796f309540dacbedf631d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 25 Apr 2007 14:47:29 +0000
Subject: [PATCH] hiding objects in texture paint mode was buggy - (you couldnt
 exit texxture paint) - so only hide/show objects in object mode. removed
 radiosity support.

According to the author -

"The Radiosity file format is my own personal format. I created it to
learn how meshes and vertex colors were stored. See IO-Examples.zip, the
example *.radio files on my web page."
---
 release/scripts/radiosity_export.py | 164 ----------------------------
 release/scripts/radiosity_import.py | 148 -------------------------
 source/blender/src/space.c          |   6 +-
 3 files changed, 3 insertions(+), 315 deletions(-)
 delete mode 100644 release/scripts/radiosity_export.py
 delete mode 100644 release/scripts/radiosity_import.py

diff --git a/release/scripts/radiosity_export.py b/release/scripts/radiosity_export.py
deleted file mode 100644
index be41e5769d9..00000000000
--- a/release/scripts/radiosity_export.py
+++ /dev/null
@@ -1,164 +0,0 @@
-#!BPY
-
-"""
-Name: 'Radiosity (.radio)...'
-Blender: 232
-Group: 'Export'
-Tooltip: 'Export selected mesh (with vertex colors) to Radiosity File Format (.radio)'
-"""
-
-__author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "elysiun",
-"Author's homepage, http://www.redrival.com/scorpius")
-__version__ = "Part of IOSuite 0.5"
-
-__bpydoc__ = """\
-This script exports meshes to Radiosity file format.
-
-The Radiosity file format is my own personal format. I created it to
-learn how meshes and vertex colors were stored. See IO-Examples.zip, the
-example *.radio files on my web page.
-
-Usage:<br>
-	Select meshes to be exported and run this script from "File->Export" menu.
-
-Notes:<br>
-	Before exporting to .radio format, the mesh must have vertex colors.
-Here's how to assign them:
-
-1. Use radiosity!
-
-2. Set up lights and materials, select a mesh, switch the drawing mode
-to "textured," press the VKEY.
-
-3. Press the VKEY and paint manually.
-
-4. Use a custom script to calculate and apply simple diffuse shading and
-specular highlights to the vertex colors.
-
-5. The Videoscape format also allows vertex colors to be specified.
-"""
-
-# $Id$
-#
-# +---------------------------------------------------------+
-# | Copyright (c) 2002 Anthony D'Agostino                   |
-# | http://www.redrival.com/scorpius                        |
-# | scorpius@netzero.com                                    |
-# | April 11, 2002                                          |
-# | Read and write Radiosity File Format (*.radio)          |
-# +---------------------------------------------------------+
-
-# ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-
-import Blender
-#import time
-import BPyMesh
-
-try:
-	import struct
-	NULL_COLOR= struct.pack('<BBBB', 255,255,255,255)
-except:
-	struct= None
-
-
-
-# ================================
-# ====== Write Radio Format ======
-# ================================
-def write(filename):
-	if not filename.lower().endswith('.radio'):
-		filename += '.radio'
-	
-	scn= Blender.Scene.GetCurrent()
-	ob= scn.objects.active
-	if not ob:
-		Blender.Draw.PupMenu('Error%t|Select 1 active object')
-		return
-	objname= ob.name
-	
-	file = open(filename, 'wb')
-	mesh = BPyMesh.getMeshFromObject(ob, None, True, False, scn)
-	if not mesh:
-		Blender.Draw.PupMenu('Error%t|Could not get mesh data from active object')
-		return
-		
-	mesh.transform(ob.matrixWorld)
-	
-	
-	
-	start = Blender.sys.time()
-	file = open(filename, "wb")
-
-	if not mesh.faceUV:
-		mesh.vertexColors= 1
-		
-		#message = 'Please assign vertex colors before exporting "%s"|object was not saved' % object.name
-		#Blender.Draw.PupMenu("ERROR%t|"+message)
-		#return
-
-	# === Object Name ===
-	file.write(struct.pack("<h", len(objname)))
-	file.write(struct.pack("<"+`len(objname)`+"s", objname))
-
-	# === Vertex List ===
-	file.write(struct.pack("<l", len(mesh.verts)))
-	for v in mesh.verts:
-		#if not i%100 and meshtools.show_progress:
-		#	Blender.Window.DrawProgressBar(float(i)/len(mesh.verts), "Writing Verts")
-		x, y, z = v.co
-		file.write(struct.pack("<fff", x, y, z))
-
-	# === Face List ===
-	file.write(struct.pack('<l', len(mesh.faces)))
-	#for i in range(len(mesh.faces)):
-	for f in mesh.faces:
-		#if not i%100 and meshtools.show_progress:
-		#	Blender.Window.DrawProgressBar(float(i)/len(mesh.faces), "Writing Faces")
-		
-		file.write(struct.pack('<b', len(f) ))
-		#for j in range(len(mesh.faces[i].v)):
-		for v in f:
-			file.write(struct.pack('<h', v.index))
-		
-		f_col= f.col
-		for c in f_col: # .col always has a length of 4
-			file.write(struct.pack('<BBBB', c.r, c.g, c.b, c.a))
-		
-		# Write the last values out again. always have 4 cols even for tris
-		if len(f_col) == 3:
-			file.write(NULL_COLOR)
-	
-	Blender.Window.DrawProgressBar(1.0, '')  # clear progressbar
-	file.close()
-	end = Blender.sys.time()
-	print '\nSuccessfully exported "%s" in %.2f seconds\n' % (Blender.sys.basename(filename), end-start)
-	
-	#meshtools.print_boxed(message)
-
-
-def main():
-	if not struct:
-		Blender.Draw.PupMenu('ERROR%t|Error: you need a full Python install to run this script')
-		return
-	
-	Blender.Window.FileSelector(write, 'Export Radio', Blender.sys.makename(ext='.radio'))
-
-if __name__ == '__main__':
-	main()
diff --git a/release/scripts/radiosity_import.py b/release/scripts/radiosity_import.py
deleted file mode 100644
index 5d301dc524e..00000000000
--- a/release/scripts/radiosity_import.py
+++ /dev/null
@@ -1,148 +0,0 @@
-#!BPY
-
-"""
-Name: 'Radiosity (.radio)...'
-Blender: 232
-Group: 'Import'
-Tooltip: 'Import Radiosity File Format (.radio) with vertex colors'
-"""
-
-__author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "elysiun",
-"Author's homepage, http://www.redrival.com/scorpius")
-__version__ = "Part of IOSuite 0.5"
-
-__bpydoc__ = """\
-This script imports Radiosity files to Blender.
-
-The Radiosity file format is my own personal format. I created it to
-learn how meshes and vertex colors were stored. See IO-Examples.zip, the
-example *.radio files on my web page.
-
-Usage:<br>
-	Execute this script from the "File->Import" menu and choose a Radiosity
-file to open.
-"""
-
-# $Id$
-#
-# +---------------------------------------------------------+
-# | Copyright (c) 2002 Anthony D'Agostino                   |
-# | http://www.redrival.com/scorpius                        |
-# | scorpius@netzero.com                                    |
-# | April 11, 2002                                          |
-# | Read and write Radiosity File Format (*.radio)          |
-# +---------------------------------------------------------+
-
-# ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-
-import Blender, meshtools
-
-try:
-	import struct
-except:
-	struct= None
-
-# ===============================
-# ====== Read Radio Format ======
-# ===============================
-def read(filename):
-	start = Blender.sys.time()
-	Blender.Window.WaitCursor(1)
-	file = open(filename, "rb")
-	mesh = Blender.NMesh.GetRaw()
-	#mesh.addMaterial(Blender.Material.New())
-	
-	NULL_UV3= [ (0,0), (0,1), (1,1) ]
-	NULL_UV4= [ (0,0), (0,1), (1,1), (1,0) ]
-	
-	
-	# === Object Name ===
-	namelen, = struct.unpack("<h",  file.read(2))
-	objname, = struct.unpack("<"+`namelen`+"s", file.read(namelen))
-
-	# === Vertex List ===
-	Vert= Blender.NMesh.Vert
-	numverts, = struct.unpack("<l", file.read(4))
-	
-	# Se we can run in a LC
-	def _vert_():
-		x,y,z= struct.unpack('<fff', file.read(12))
-		return Vert(x, y, z)
-	
-	mesh.verts= [_vert_() for i in xrange(numverts)]
-	del _vert_
-	
-	
-	# === Face List ===
-	Face= Blender.NMesh.Face
-	Col= Blender.NMesh.Col
-	numfaces, = struct.unpack("<l", file.read(4))
-	for i in xrange(numfaces):
-		#if not i%100 and meshtools.show_progress:
-		#	Blender.Window.DrawProgressBar(float(i)/numfaces, "Reading Faces")
-
-		
-		numfaceverts, = struct.unpack("<b", file.read(1))
-		
-		
-		face = Face(\
-		 [\
-		 mesh.verts[\
-		  struct.unpack("<h", file.read(2))[0]] for j in xrange(numfaceverts)\
-		 ]
-		)
-		
-		face.col= [ Col(r, g, b, a) \
-		for j in xrange(4)\
-		for r,g,b,a in ( struct.unpack("<BBBB", file.read(4)), )]
-		
-		if len(face) == 3:
-			face.uv = NULL_UV3
-		else:
-			face.uv = NULL_UV4
-
-		
-		face.mode = 0
-		mesh.faces.append(face)
-
-	scn= Blender.Scene.GetCurrent()
-	scn.objects.selected = []
-	
-	mesh.name= objname
-	scn.objects.new(mesh)
-	
-	Blender.Window.DrawProgressBar(1.0, '')  # clear progressbar
-	file.close()
-	end = Blender.sys.time()
-	message = 'Successfully imported "%s" in %.2f seconds' % (Blender.sys.basename(filename), end-start)
-	meshtools.print_boxed(message)
-	Blender.Window.WaitCursor(0)
-	Blender.Window.RedrawAll()
-
-
-def main():
-	if not struct:
-		Blender.Draw.PupMenu('ERROR%t|Error: you need a full Python install to run this script')
-		return
-	
-	Blender.Window.FileSelector(read, 'Import Radio', '*.radio')
-
-if __name__ == '__main__':
-	main()
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 9c822e45db9..631de27aead 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1924,9 +1924,9 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 						hide_unselected_pose_bones();
 					else if (G.qual==LR_ALTKEY)
 						show_all_pose_bones();
-				} 
-				
-				else {
+				}
+				/* Object mode only, other modes are accounted for above */
+				else if ((G.f & G_VERTEXPAINT|G_TEXTUREPAINT|G_WEIGHTPAINT)==0) {
 					if(G.qual==LR_CTRLKEY)hookmenu();
 					else if(G.qual==LR_ALTKEY) show_objects();
 					else if(G.qual==LR_SHIFTKEY) hide_objects(0);