Blender Git Loki
Git Commits -> Revision f871330
Revision f871330 by Dalai Felinto (bake-cycles) April 23, 2014, 00:14 (GMT) |
Cycles-Bake: Squash of first commits I squashed the previous commit to undo the rename of bake.c > bake_old.c This was merge-conflict prone since any change in the bake.c would generate conflict. (same for object_bake.c) * More work on getting cycles to have its bake function called. * Getting through the beast - bake gets called inside Cycles * I get a crash though, on free_session() * Get render pass for baking from enum * Sending the BakePixel and float pointers all the way to Cycles o/ * Sending some data back just to validate the pipeline going in and out |
Commit Details:
Full Hash: f87133029eeb2587722db2ed5f6d8f954ab08c2e
Parent Commit: 421c42b
Lines Changed: +785, -44
4 Added Paths:
/intern/cycles/render/bake.cpp (+1, -0) (View)
/source/blender/editors/object/object_bake_new.c (+331, -0) (View)
/source/blender/render/extern/include/RE_bake.h (+50, -0) (View)
/source/blender/render/intern/source/bake_new.c (+83, -0) (View)
/source/blender/editors/object/object_bake_new.c (+331, -0) (View)
/source/blender/render/extern/include/RE_bake.h (+50, -0) (View)
/source/blender/render/intern/source/bake_new.c (+83, -0) (View)
16 Modified Paths:
/intern/cycles/blender/addon/engine.py (+5, -0) (Diff)
/intern/cycles/blender/addon/__init__.py (+3, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+31, -0) (Diff)
/intern/cycles/blender/blender_session.cpp (+43, -2) (Diff)
/intern/cycles/blender/blender_session.h (+12, -0) (Diff)
/intern/cycles/render/mesh_displace.cpp (+73, -0) (Diff)
/source/blender/editors/object/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+82, -38) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/render/CMakeLists.txt (+2, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+5, -0) (Diff)
/source/blender/render/intern/source/bake.c (+2, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+56, -4) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/intern/cycles/blender/addon/__init__.py (+3, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+31, -0) (Diff)
/intern/cycles/blender/blender_session.cpp (+43, -2) (Diff)
/intern/cycles/blender/blender_session.h (+12, -0) (Diff)
/intern/cycles/render/mesh_displace.cpp (+73, -0) (Diff)
/source/blender/editors/object/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+82, -38) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/render/CMakeLists.txt (+2, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+5, -0) (Diff)
/source/blender/render/intern/source/bake.c (+2, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+56, -4) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021