[Bf-blender-cvs] [c81549af28d] master: Cleanup: unused vars, clang-format

Campbell Barton noreply at git.blender.org
Tue Jan 21 10:58:50 CET 2020


Commit: c81549af28d1fb50b1f44f71cd2e2218746ec262
Author: Campbell Barton
Date:   Tue Jan 21 20:57:15 2020 +1100
Branches: master
https://developer.blender.org/rBc81549af28d1fb50b1f44f71cd2e2218746ec262

Cleanup: unused vars, clang-format

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

M	intern/cycles/render/shader.cpp
M	source/blender/editors/space_graph/graph_buttons.c

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

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index da04ef63295..661208c6463 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -317,7 +317,8 @@ void Shader::tag_update(Scene *scene)
    * has use_mis set to false. We are quite close to release now, so
    * better to be safe.
    */
-  if (this == scene->background->get_shader(scene) && scene->light_manager->has_background_light(scene)) {
+  if (this == scene->background->get_shader(scene) &&
+      scene->light_manager->has_background_light(scene)) {
     scene->light_manager->need_update = true;
   }
 
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index 3bea3346f88..0a3663372be 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -156,7 +156,7 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
   FCurve *fcu;
   PointerRNA fcu_ptr;
   uiLayout *layout = pa->layout;
-  uiLayout *col, *row, *sub;
+  uiLayout *col;
   char name[256];
   int icon = 0;



More information about the Bf-blender-cvs mailing list