[Bf-blender-cvs] [66aa0a21819] temp-lanpr-review: LANPR: dpix_shader_error type and rna definition fixes.

[YimingWu]

Commit: 66aa0a21819afba5892b89f872449734fbf118d9
Author: YimingWu
Date:   Wed Nov 20 21:32:54 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB66aa0a21819afba5892b89f872449734fbf118d9

LANPR: dpix_shader_error type and rna definition fixes.

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

M	source/blender/draw/engines/lanpr/lanpr_dpix.c
M	source/blender/editors/include/ED_lanpr.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index c4dcdfdaafb..0d7082c4118 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -143,7 +143,7 @@ void lanpr_init_atlas_inputs(void *ved)
         datatoc_lanpr_dpix_project_clip_frag_glsl,
         NULL);
     if (lanpr_share.dpix_transform_shader == NULL) {
-      lanpr_share.dpix_shader_error = 1;
+      lanpr_share.dpix_shader_error = true;
       printf("LANPR: DPIX transform shader compile error.");
     }
   }
@@ -154,7 +154,7 @@ void lanpr_init_atlas_inputs(void *ved)
         datatoc_lanpr_dpix_preview_frag_glsl,
         NULL);
     if (lanpr_share.dpix_transform_shader == NULL) {
-      lanpr_share.dpix_shader_error = 1;
+      lanpr_share.dpix_shader_error = true;
       printf("LANPR: DPIX transform shader compile error.");
     }
   }
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 1ab5bc9dfee..c3ef8288524 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -297,7 +297,7 @@ typedef struct LANPR_SharedResource {
   /* GPU */
   struct GPUShader *dpix_transform_shader;
   struct GPUShader *dpix_preview_shader;
-  int dpix_shader_error;
+  bool dpix_shader_error;
   int texture_size;
   ListBase dpix_batch_list;
   int dpix_reloaded;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index d1f79017a29..6bcf061eefe 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7215,7 +7215,8 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
   /* should be read-only */
   prop = RNA_def_property(srna, "shader_error", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_default(prop, 0);
-  RNA_def_property_boolean_funcs(prop, "rna_lanpr_shader_error_get", "");
+  RNA_def_property_boolean_funcs(prop, "rna_lanpr_shader_error_get", NULL);
+  RNA_def_property_clear_flag(prop, PROP_EDITABLE);
   RNA_def_property_ui_text(
       prop, "DPIX Shader Error", "Can't compile DPIX transform shader on your GPU");