[Bf-blender-cvs] [5485057a27b] master: Cleanup: compiler warnings

Brecht Van Lommel noreply at git.blender.org
Fri Jun 17 19:26:27 CEST 2022


Commit: 5485057a27b92400ddc57dfb67c1017f26fefad8
Author: Brecht Van Lommel
Date:   Fri Jun 17 18:29:12 2022 +0200
Branches: master
https://developer.blender.org/rB5485057a27b92400ddc57dfb67c1017f26fefad8

Cleanup: compiler warnings

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

M	source/blender/blenkernel/BKE_mesh_sample.hh
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/makesrna/intern/rna_pose.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_sample.hh b/source/blender/blenkernel/BKE_mesh_sample.hh
index f47201e89cc..cbbd0249f4f 100644
--- a/source/blender/blenkernel/BKE_mesh_sample.hh
+++ b/source/blender/blenkernel/BKE_mesh_sample.hh
@@ -18,7 +18,7 @@ struct Mesh;
 struct BVHTreeFromMesh;
 
 namespace blender {
-struct RandomNumberGenerator;
+class RandomNumberGenerator;
 }
 
 namespace blender::bke {
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 341d5e78872..7c00c4f1875 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4818,8 +4818,7 @@ static int ui_do_but_GRIDTILE(bContext *C,
                               uiHandleButtonData *data,
                               const wmEvent *event)
 {
-  uiButGridTile *grid_tile_but = (uiButGridTile *)but;
-  BLI_assert(grid_tile_but->but.type == UI_BTYPE_GRID_TILE);
+  BLI_assert(but->type == UI_BTYPE_GRID_TILE);
 
   if (data->state == BUTTON_STATE_HIGHLIGHT) {
     if (event->type == LEFTMOUSE) {
@@ -4840,7 +4839,8 @@ static int ui_do_but_GRIDTILE(bContext *C,
 
         case KM_DBL_CLICK:
           data->cancel = true;
-          //          UI_tree_view_item_begin_rename(grid_tile_but->tree_item);
+          // uiButGridTile *grid_tile_but = (uiButGridTile *)but;
+          // UI_tree_view_item_begin_rename(grid_tile_but->tree_item);
           ED_region_tag_redraw(CTX_wm_region(C));
           return WM_UI_HANDLER_BREAK;
       }
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 4108baca2fa..30df8e20e8d 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -698,16 +698,18 @@ bool rna_PoseChannel_constraints_override_apply(Main *bmain,
   return true;
 }
 
-static int rna_PoseChannel_proxy_editable(PointerRNA *ptr, const char **r_info)
+static int rna_PoseChannel_proxy_editable(PointerRNA *UNUSED(ptr), const char **UNUSED(r_info))
 {
+#  if 0
   Object *ob = (Object *)ptr->owner_id;
   bArmature *arm = ob->data;
   bPoseChannel *pchan = (bPoseChannel *)ptr->data;
 
-  if (false && pchan->bone && (pchan->bone->layer & arm->layer_protected)) {
+  if (pchan->bone && (pchan->bone->layer & arm->layer_protected)) {
     *r_info = "Can't edit property of a proxy on a protected layer";
     return 0;
   }
+#  endif
 
   return PROP_EDITABLE;
 }



More information about the Bf-blender-cvs mailing list