aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Rushforth <[email protected]>2006-10-24 19:53:15 +0000
committerKevin Rushforth <[email protected]>2006-10-24 19:53:15 +0000
commit4f8003817e06190d1c9609d94209c591d436f238 (patch)
tree361fa94baf086188b7f64fdcc128acfeec490d6c /src
parent1d62a75524a775715a7b26b3256034b00ba3bba1 (diff)
Fixed issue 369: Clip throws NPE in case of region = null in a live scene
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@725 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src')
-rw-r--r--src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
index 1491e5e..650b34e 100644
--- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
@@ -1061,8 +1061,9 @@ class RenderingEnvironmentStructure extends J3dStructure implements ObjectUpdate
for (i=0 ; i<size; i++) {
clip = (ClipRetained)globalClips.get(i);
- if (clip.transformedRegion.intersect(bounds) == true
- && clip.switchState.currentSwitchOn) {
+ if (clip.transformedRegion != null &&
+ clip.transformedRegion.intersect(bounds) == true &&
+ clip.switchState.currentSwitchOn) {
intersectedBounds[nclips] = clip.transformedRegion;
intersectedClips[nclips++] = clip;
}