Commit: 6719fb824809e9f493c77a6b1737f243c62f7b50
Author: Campbell Barton
Date: Fri Feb 13 04:21:11 2015 +1100
Branches: viewport_experiments
https://developer.blender.org/rB6719fb824809e9f493c77a6b1737f243c62f7b50
move comment to view3d
===================================================================
M source/blender/makesdna/DNA_gpu_types.h
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_gpu_types.h
b/source/blender/makesdna/DNA_gpu_types.h
index 5325992..d89205c 100644
--- a/source/blender/makesdna/DNA_gpu_types.h
+++ b/source/blender/makesdna/DNA_gpu_types.h
@@ -51,7 +51,7 @@ typedef struct GPUSSAOSettings {
} GPUSSAOSettings;
typedef struct GPUFXSettings {
- GPUDOFSettings *dof; /* note, currently not allocated, instead set
(temporarily) from camera */
+ GPUDOFSettings *dof;
GPUSSAOSettings *ssao;
char fx_flag; /* eGPUFXFlags */
char pad[7];
diff --git a/source/blender/makesdna/DNA_view3d_types.h
b/source/blender/makesdna/DNA_view3d_types.h
index 4aedf41..210dedd 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -220,6 +220,8 @@ typedef struct View3D {
/* built-in shader effects (eGPUFXFlags) */
char pad3[5];
+ /* note, 'fx_settings.dof' is currently _not_ allocated,
+ * instead set (temporarily) from camera */
struct GPUFXSettings fx_settings;
void *properties_storage; /* Nkey panel stores stuff here
(runtime only!) */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
