[Bf-blender-cvs] [cf623d8e7b8] temp-lanpr-review: Address some minor warnings

Julian Eisel noreply at git.blender.org
Wed Nov 27 15:39:01 CET 2019


Commit: cf623d8e7b8ba54fa2f9c5344589d0b184916e56
Author: Julian Eisel
Date:   Wed Nov 27 15:36:36 2019 +0100
Branches: temp-lanpr-review
https://developer.blender.org/rBcf623d8e7b8ba54fa2f9c5344589d0b184916e56

Address some minor warnings

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

M	source/blender/editors/include/ED_lanpr.h
M	source/blender/makesrna/intern/rna_collection.c

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

diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 44c54b8d6d8..2e9afef8bbc 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -600,8 +600,4 @@ void OBJECT_OT_lanpr_update_gp_source(struct wmOperatorType *ot);
 
 void ED_operatortypes_lanpr(void);
 
-/* for rna */
-struct PointerRNA;
-static bool rna_lanpr_shader_error_get(struct PointerRNA *UNUSED(ptr));
-
 #endif /* __ED_LANPR_H__ */
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 6bdca3d3c0a..f096c573383 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -317,12 +317,12 @@ static void rna_Collection_flag_update(Main *bmain, Scene *scene, PointerRNA *pt
 
 static bool rna_Collection_lanpr_configure_get(PointerRNA *ptr)
 {
-  Collection *c = ptr->owner_id;
+  Collection *c = (Collection *)ptr->owner_id;
   return (c->flag & COLLECTION_CONFIGURED_FOR_LANPR);
 }
 static void rna_Collection_lanpr_configure_set(PointerRNA *ptr, const bool value)
 {
-  Collection *c = ptr->owner_id;
+  Collection *c = (Collection *)ptr->owner_id;
   CollectionLANPR *lanpr = c->lanpr;
 
   if (value) {



More information about the Bf-blender-cvs mailing list