[Bf-blender-cvs] [fca3579] bake-cycles: Cycles-Bake: fix compile error on linux
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:46:18 CEST 2014
Commit: fca35792ebd0830585bcde6d272eaf8b963aa949
Author: Dalai Felinto
Date: Thu Jan 2 19:29:57 2014 -0200
https://developer.blender.org/rBfca35792ebd0830585bcde6d272eaf8b963aa949
Cycles-Bake: fix compile error on linux
===================================================================
M source/blender/editors/object/object_bake_new.c
===================================================================
diff --git a/source/blender/editors/object/object_bake_new.c b/source/blender/editors/object/object_bake_new.c
index 5841f6c..8cffe20 100644
--- a/source/blender/editors/object/object_bake_new.c
+++ b/source/blender/editors/object/object_bake_new.c
@@ -130,6 +130,11 @@ static int bake_exec(bContext *C, wmOperator *op)
Render *re = RE_NewRender(scene->id.name);
+ float *result;
+ BakePixel *pixel_array;
+ const int num_pixels = 100;
+ const int depth = 1;
+
RE_engine_bake_set_engine_parameters(re, CTX_data_main(C), scene);
G.is_break = FALSE;
@@ -137,11 +142,6 @@ static int bake_exec(bContext *C, wmOperator *op)
RE_test_break_cb(re, NULL, bake_break);
RE_SetReports(re, op->reports);
- float *result;
- BakePixel *pixel_array;
- const int num_pixels = 100;
- const int depth = 1;
-
pixel_array = MEM_callocN(sizeof(BakePixel), "bake pixels");
result = MEM_callocN(sizeof(float) * depth * num_pixels, "bake return pixels");
More information about the Bf-blender-cvs
mailing list