Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillian Padovani Germano <wpgermano@gmail.com>2004-07-25 20:55:45 +0400
committerWillian Padovani Germano <wpgermano@gmail.com>2004-07-25 20:55:45 +0400
commitc50e3f374fe08713b573559904c5f53d852c5e13 (patch)
treec5bc2eb290f96c6ad4916de6f5b15c57ffcb79a7 /source/blender/radiosity
parentfe9336eb880a1a97121e5f2a6a94c93870d4549b (diff)
BPython:
- new submodule Scene.Radio, for radiosity: still incomplete, but in shape for demos, updated SConscript to include it; - new functions in Window module; - doc updates: adding a todo file and a new start page for our docs: API_intro.py + other updates; - small fix in Ipo.c provided by Damien McGuinnes (thanks!): Nathan has a patch with IPO additions and fixes for this and more, but until it is committed, there's this fix for Ipo.getCurve('LocX'), LocY, Z and QuatW,X,Y,Z too, according to Damien. Other files: - radpreprocess.c: added check for "during_script()" so eventual msgs don't popup during scripts; - drawmesh.c: made a pointer (display list) be checked before accessed, fixes crash in scripts that forget to update display lists for subsurf meshes when a 3d view is in textured view mode. Script: updated bevel_center by Loic Berthe.
Diffstat (limited to 'source/blender/radiosity')
-rw-r--r--source/blender/radiosity/intern/source/radpreprocess.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c
index 1f2f8bc2a89..3c94bfc1a22 100644
--- a/source/blender/radiosity/intern/source/radpreprocess.c
+++ b/source/blender/radiosity/intern/source/radpreprocess.c
@@ -60,6 +60,7 @@
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_material.h"
+#include "BKE_object.h" /* during_script() */
#include "BIF_toolbox.h"
@@ -300,7 +301,7 @@ void rad_collect_meshes()
int a, b, offs, index, matindex;
if(G.obedit) {
- error("Unable to perform function in EditMode");
+ if (!during_script()) error("Unable to perform function in EditMode");
return;
}
@@ -325,7 +326,7 @@ void rad_collect_meshes()
base= base->next;
}
if(RG.totvert==0) {
- error("No vertices");
+ if (!during_script()) error("No vertices");
return;
}
vnc= RG.verts= MEM_callocN(RG.totvert*sizeof(VeNoCo), "readvideoscape1");