[Bf-blender-cvs] [1f875e60b7c] soc-2019-npr: LANPR: GPU mode follow object/collection usage flag.

[YimingWu]

Commit: 1f875e60b7c431d8254ca0eec058f5b331509a9c
Author: YimingWu
Date:   Mon Jul 8 16:15:20 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB1f875e60b7c431d8254ca0eec058f5b331509a9c

LANPR: GPU mode follow object/collection usage flag.

===================================================================

M	source/blender/draw/engines/lanpr/lanpr_engine.c

===================================================================

diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 3df81b6b362..937145e3c71 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -441,6 +441,8 @@ static void lanpr_cache_init(void *vedata)
   }
 }
 
+int lanpr_object_collection_usage_check(Collection *c, Object *o);
+
 static void lanpr_cache_populate(void *vedata, Object *ob)
 {
 
@@ -467,6 +469,10 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
 
   if (lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->active_layer &&
       !lanpr_share.dpix_shader_error) {
+    int usage = lanpr_object_collection_usage_check(draw_ctx->scene->master_collection, ob);
+    if(usage != OBJECT_FEATURE_LINE_INHERENT){
+      return;
+    }
     int idx = pd->begin_index;
     if (lanpr->reloaded) {
       pd->begin_index = lanpr_feed_atlas_data_obj(vedata,