Revision: 50211
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50211
Author: campbellbarton
Date: 2012-08-25 22:51:30 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
minor changes needed for building with smoke disabled
Modified Paths:
--------------
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
Modified:
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
2012-08-25 22:43:41 UTC (rev 50210)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
2012-08-25 22:51:30 UTC (rev 50211)
@@ -154,7 +154,9 @@
void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float
*UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float
*UNUSED(vorticity),
int *UNUSED(border_colli),
float *UNUSED(burning_rate), float *UNUSED(flame_smoke), float
*UNUSED(flame_smoke_color),
float
*UNUSED(flame_vorticity), float *UNUSED(flame_ignition_temp), float
*UNUSED(flame_max_temp)) {}
-void smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene),
Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) {}
+struct DerivedMesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene
*UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) { return NULL; }
+float smoke_get_velocity_at(struct Object *UNUSED(ob), float
UNUSED(position[3]), float UNUSED(velocity[3])) { return 0.0f; }
+void flame_get_spectrum(unsigned char *UNUSED(spec), int UNUSED(width), float
UNUSED(t1), float UNUSED(t2)) {}
#endif /* WITH_SMOKE */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
