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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2015-01-17 16:33:13 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2015-01-17 18:39:03 +0300
commitc9e5d9226b8c89f0081f8191f868c23e595b0c3f (patch)
tree52ac59048c9f21e9fcee967b9e9ea29b3e888f90 /source/blender/freestyle/intern/stroke/Canvas.h
parent448d143ad0e73a9d2c86f84def2b9f89b8332470 (diff)
Fix T43090: Cycles + Freestyle + border render = black render.
The reported problem was due to a special case where there are no strokes to be rendered. Since rendering an empty scene is a waste of time, the issue was addressed here by skipping the stroke rendering process entirely.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Canvas.h')
-rw-r--r--source/blender/freestyle/intern/stroke/Canvas.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h
index b56b5f92c14..5919344b6e0 100644
--- a/source/blender/freestyle/intern/stroke/Canvas.h
+++ b/source/blender/freestyle/intern/stroke/Canvas.h
@@ -95,6 +95,7 @@ protected:
static const char *_MapsPath;
SteerableViewMap *_steerableViewMap;
bool _basic;
+ int stroke_count;
public:
/* Builds the Canvas */
@@ -213,7 +214,10 @@ public:
return false;
}
- int stroke_count;
+ inline int getStrokeCount() const
+ {
+ return stroke_count;
+ }
/*! modifiers */
inline void setSelectedFEdge(FEdge *iFEdge)