2 files changed, 11 insertions, 8 deletions

diff --git a/src/studio.cpp b/src/studio.cpp
index 110ce74..c4c3cfb 100644
--- a/src/studio.cpp
+++ b/src/studio.cpp
@@ -125,8 +125,12 @@ void hook_draw_model(void *self, void *results, void *info, void *bone,
     logf("studio: DrawModel model=\"%s\" prop=%d", model ? model : "?",
          (int)prop);
   }
-  if (prop)
+  if (prop) {
+    float c[4];
+    prop_color(c);
+    g_orig_set_color(self, c);
     g_prop_depth++;
+  }
   g_orig_draw_model(self, results, info, bone, flex, flex_delayed, flags);
   if (prop)
     g_prop_depth--;
diff --git a/src/world.cpp b/src/world.cpp
index d7023c7..2fa1fc4 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -180,7 +180,9 @@ bool apply_tint(int world_r, int world_g, int world_b, int sky_r, int sky_g,
 
   float wr = world_r / 255.0f, wg = world_g / 255.0f, wb = world_b / 255.0f;
   float sr = sky_r / 255.0f, sg = sky_g / 255.0f, sb = sky_b / 255.0f;
-  float pr = prop_r / 255.0f, pg = prop_g / 255.0f, pb = prop_b / 255.0f;
+  (void)prop_r;
+  (void)prop_g;
+  (void)prop_b;
 
   unsigned short inv = invalid(ms);
   int seen = 0, world_hits = 0, sky_hits = 0, prop_hits = 0;
@@ -215,13 +217,10 @@ bool apply_tint(int world_r, int world_g, int world_b, int sky_r, int sky_g,
       mod_fn(mat, sr, sg, sb);
       sky_hits++;
     } else if (is_prop_material(name)) {
-      mod_fn(mat, pr, pg, pb);
+      // Props are tinted through IStudioRender (studio.cpp); material
+      // modulation is overridden per draw by the engine, so leave prop
+      // materials untouched here.
       prop_hits++;
-      static int crate_logs = 0;
-      if (crate_logs < 8 && strstr(name, "crate")) {
-        crate_logs++;
-        logf("tint: prop material \"%s\"", name);
-      }
     }
   }
   logf("tint: applied world=%d(%d,%d,%d) sky=%d(%d,%d,%d) props=%d(%d,%d,%d) "